From f3cff3345de7f0fae360d80ffc1626fbe4453d4d Mon Sep 17 00:00:00 2001
From: Denis Strigo <d.strigo@akveo.com>
Date: Wed, 17 Oct 2018 20:05:36 +0300
Subject: [PATCH 01/11] feat(components): add new nebular components(stepper,
 dialog, calendar, accordion, datepicker)

---
 src/app/@theme/theme.module.ts                |  17 +++
 src/app/pages/dashboard/dashboard.module.ts   |   1 -
 .../accordion/accordion.component.html        |  81 ++++++++++
 .../accordion/accordion.component.scss        |   9 ++
 .../nebular/accordion/accordion.component.ts  |  15 ++
 .../nebular/calundar/calendar.component.html  |  26 ++++
 .../nebular/calundar/calendar.component.scss  |  17 +++
 .../nebular/calundar/calendar.component.ts    |  32 ++++
 .../calundar/day-cell/day-cell.component.html |   4 +
 .../calundar/day-cell/day-cell.component.scss |  10 ++
 .../calundar/day-cell/day-cell.component.ts   |  11 ++
 .../datepicker/datepicker.component.html      |  24 +++
 .../datepicker/datepicker.component.scss      |  17 +++
 .../datepicker/datepicker.component.ts        |  21 +++
 .../dialog-name-prompt.component.html         |  10 ++
 .../dialog-name-prompt.component.scss         |   4 +
 .../dialog-name-prompt.component.ts           |  20 +++
 .../nebular/dialog/dialog.component.html      |  45 ++++++
 .../nebular/dialog/dialog.component.scss      |   8 +
 .../pages/nebular/dialog/dialog.component.ts  |  62 ++++++++
 .../showcase-dialog.component.html            |  14 ++
 .../showcase-dialog.component.scss            |   4 +
 .../showcase-dialog.component.ts              |  18 +++
 .../pages/nebular/nebular-routing.module.ts   |  45 ++++++
 src/app/pages/nebular/nebular.component.ts    |  11 ++
 src/app/pages/nebular/nebular.module.ts       |  55 +++++++
 .../nebular/stepper/stepper.component.html    | 139 ++++++++++++++++++
 .../nebular/stepper/stepper.component.scss    |  24 +++
 .../nebular/stepper/stepper.component.ts      |  43 ++++++
 src/app/pages/pages-menu.ts                   |  26 ++++
 src/app/pages/pages-routing.module.ts         |   3 +
 31 files changed, 815 insertions(+), 1 deletion(-)
 create mode 100644 src/app/pages/nebular/accordion/accordion.component.html
 create mode 100644 src/app/pages/nebular/accordion/accordion.component.scss
 create mode 100644 src/app/pages/nebular/accordion/accordion.component.ts
 create mode 100644 src/app/pages/nebular/calundar/calendar.component.html
 create mode 100644 src/app/pages/nebular/calundar/calendar.component.scss
 create mode 100644 src/app/pages/nebular/calundar/calendar.component.ts
 create mode 100644 src/app/pages/nebular/calundar/day-cell/day-cell.component.html
 create mode 100644 src/app/pages/nebular/calundar/day-cell/day-cell.component.scss
 create mode 100644 src/app/pages/nebular/calundar/day-cell/day-cell.component.ts
 create mode 100644 src/app/pages/nebular/datepicker/datepicker.component.html
 create mode 100644 src/app/pages/nebular/datepicker/datepicker.component.scss
 create mode 100644 src/app/pages/nebular/datepicker/datepicker.component.ts
 create mode 100644 src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.html
 create mode 100644 src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.scss
 create mode 100644 src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.ts
 create mode 100644 src/app/pages/nebular/dialog/dialog.component.html
 create mode 100644 src/app/pages/nebular/dialog/dialog.component.scss
 create mode 100644 src/app/pages/nebular/dialog/dialog.component.ts
 create mode 100644 src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.html
 create mode 100644 src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.scss
 create mode 100644 src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.ts
 create mode 100644 src/app/pages/nebular/nebular-routing.module.ts
 create mode 100644 src/app/pages/nebular/nebular.component.ts
 create mode 100644 src/app/pages/nebular/nebular.module.ts
 create mode 100644 src/app/pages/nebular/stepper/stepper.component.html
 create mode 100644 src/app/pages/nebular/stepper/stepper.component.scss
 create mode 100644 src/app/pages/nebular/stepper/stepper.component.ts

diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts
index 84ce3ac6dc..8b7e5126fe 100644
--- a/src/app/@theme/theme.module.ts
+++ b/src/app/@theme/theme.module.ts
@@ -18,6 +18,13 @@ import {
   NbPopoverModule,
   NbContextMenuModule,
   NbProgressBarModule,
+  NbCalendarModule,
+  NbCalendarRangeModule,
+  NbStepperModule,
+  NbButtonModule,
+  NbInputModule,
+  NbAccordionModule,
+  NbDatepickerModule, NbDialogModule,
 } from '@nebular/theme';
 
 import { NbSecurityModule } from '@nebular/security';
@@ -68,6 +75,14 @@ const NB_MODULES = [
   NgbModule,
   NbSecurityModule, // *nbIsGranted directive,
   NbProgressBarModule,
+  NbCalendarModule,
+  NbCalendarRangeModule,
+  NbStepperModule,
+  NbButtonModule,
+  NbInputModule,
+  NbAccordionModule,
+  NbDatepickerModule,
+  NbDialogModule,
 ];
 
 const COMPONENTS = [
@@ -107,6 +122,8 @@ const NB_THEME_PROVIDERS = [
   ).providers,
   ...NbSidebarModule.forRoot().providers,
   ...NbMenuModule.forRoot().providers,
+  ...NbDatepickerModule.forRoot().providers,
+  ...NbDialogModule.forRoot().providers,
 ];
 
 @NgModule({
diff --git a/src/app/pages/dashboard/dashboard.module.ts b/src/app/pages/dashboard/dashboard.module.ts
index 09d220f020..2ffdd614c9 100644
--- a/src/app/pages/dashboard/dashboard.module.ts
+++ b/src/app/pages/dashboard/dashboard.module.ts
@@ -21,7 +21,6 @@ import { PlayerComponent } from './rooms/player/player.component';
 import { TrafficComponent } from './traffic/traffic.component';
 import { TrafficChartComponent } from './traffic/traffic-chart.component';
 
-
 @NgModule({
   imports: [
     ThemeModule,
diff --git a/src/app/pages/nebular/accordion/accordion.component.html b/src/app/pages/nebular/accordion/accordion.component.html
new file mode 100644
index 0000000000..b87f0bdf17
--- /dev/null
+++ b/src/app/pages/nebular/accordion/accordion.component.html
@@ -0,0 +1,81 @@
+<div class="accordions-container">
+  <div class="accordion-container">
+    <nb-card>
+      <nb-card-body>
+        <button nbButton (click)="toggle()">Toggle First Item</button>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-accordion>
+      <nb-accordion-item #item>
+        <nb-accordion-item-header>
+          Product Details
+        </nb-accordion-item-header>
+        <nb-accordion-item-body>
+          A nebula is an interstellar cloud of dust, hydrogen, helium and other ionized gases.
+          Originally, nebula was a name for any diffuse astronomical object,
+          including galaxies beyond the Milky Way.
+        </nb-accordion-item-body>
+      </nb-accordion-item>
+
+      <nb-accordion-item>
+        <nb-accordion-item-header>
+          Reviews
+        </nb-accordion-item-header>
+        <nb-accordion-item-body>
+          A nebula is an interstellar cloud of dust, hydrogen, helium and other ionized gases.
+          Originally, nebula was a name for any diffuse astronomical object,
+          including galaxies beyond the Milky Way.
+        </nb-accordion-item-body>
+      </nb-accordion-item>
+
+      <nb-accordion-item>
+        <nb-accordion-item-header>
+          Edit
+        </nb-accordion-item-header>
+        <nb-accordion-item-body>
+          A nebula is an interstellar cloud of dust, hydrogen, helium and other ionized gases.
+          Originally, nebula was a name for any diffuse astronomical object,
+          including galaxies beyond the Milky Way.
+        </nb-accordion-item-body>
+      </nb-accordion-item>
+    </nb-accordion>
+  </div>
+
+  <div class="accordion-container">
+    <nb-accordion multi>
+      <nb-accordion-item>
+        <nb-accordion-item-header>
+          Product Details
+        </nb-accordion-item-header>
+        <nb-accordion-item-body>
+          A nebula is an interstellar cloud of dust, hydrogen, helium and other ionized gases.
+          Originally, nebula was a name for any diffuse astronomical object,
+          including galaxies beyond the Milky Way.
+        </nb-accordion-item-body>
+      </nb-accordion-item>
+
+      <nb-accordion-item>
+        <nb-accordion-item-header>
+          Reviews
+        </nb-accordion-item-header>
+        <nb-accordion-item-body>
+          A nebula is an interstellar cloud of dust, hydrogen, helium and other ionized gases.
+          Originally, nebula was a name for any diffuse astronomical object,
+          including galaxies beyond the Milky Way.
+        </nb-accordion-item-body>
+      </nb-accordion-item>
+
+      <nb-accordion-item>
+        <nb-accordion-item-header>
+          Edit
+        </nb-accordion-item-header>
+        <nb-accordion-item-body>
+          A nebula is an interstellar cloud of dust, hydrogen, helium and other ionized gases.
+          Originally, nebula was a name for any diffuse astronomical object,
+          including galaxies beyond the Milky Way.
+        </nb-accordion-item-body>
+      </nb-accordion-item>
+    </nb-accordion>
+  </div>
+</div>
diff --git a/src/app/pages/nebular/accordion/accordion.component.scss b/src/app/pages/nebular/accordion/accordion.component.scss
new file mode 100644
index 0000000000..05a71878a9
--- /dev/null
+++ b/src/app/pages/nebular/accordion/accordion.component.scss
@@ -0,0 +1,9 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  .accordion-container {
+    &:not(:first-child) {
+      margin-top: 3rem;
+    }
+  }
+}
diff --git a/src/app/pages/nebular/accordion/accordion.component.ts b/src/app/pages/nebular/accordion/accordion.component.ts
new file mode 100644
index 0000000000..e7aa4a10fe
--- /dev/null
+++ b/src/app/pages/nebular/accordion/accordion.component.ts
@@ -0,0 +1,15 @@
+import { Component, ViewChild } from '@angular/core';
+
+@Component({
+  selector: 'ngx-accordion',
+  templateUrl: 'accordion.component.html',
+  styleUrls: ['accordion.component.scss'],
+})
+export class AccordionComponent {
+
+  @ViewChild('item') accordion;
+
+  toggle() {
+    this.accordion.toggle();
+  }
+}
diff --git a/src/app/pages/nebular/calundar/calendar.component.html b/src/app/pages/nebular/calundar/calendar.component.html
new file mode 100644
index 0000000000..d362d39b9c
--- /dev/null
+++ b/src/app/pages/nebular/calundar/calendar.component.html
@@ -0,0 +1,26 @@
+<nb-card>
+  <nb-card-header>
+    Calendar
+  </nb-card-header>
+  <nb-card-body>
+    <div class="nebular-calendar">
+      <h2>
+        Selected date: {{ date | date }}
+      </h2>
+      <nb-calendar [(date)]="date" [boundingMonth]="true"></nb-calendar>
+    </div>
+    <div class="nebular-calendar">
+      <h2>
+        Selected range: {{ range.start | date }} - {{ range.end | date }}
+      </h2>
+      <nb-calendar-range [(range)]="range"></nb-calendar-range>
+    </div>
+    <div class="nebular-calendar">
+      <h1>Selected date: {{ date2 | date }}</h1>
+      <nb-calendar
+        [(date)]="date2"
+        [dayCellComponent]="dayCellComponent"
+      ></nb-calendar>
+    </div>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/nebular/calundar/calendar.component.scss b/src/app/pages/nebular/calundar/calendar.component.scss
new file mode 100644
index 0000000000..1a296304bc
--- /dev/null
+++ b/src/app/pages/nebular/calundar/calendar.component.scss
@@ -0,0 +1,17 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+
+  nb-card-body {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .nebular-calendar {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+}
diff --git a/src/app/pages/nebular/calundar/calendar.component.ts b/src/app/pages/nebular/calundar/calendar.component.ts
new file mode 100644
index 0000000000..67e1c8bb9c
--- /dev/null
+++ b/src/app/pages/nebular/calundar/calendar.component.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { NbCalendarRange, NbDateService } from '@nebular/theme';
+import { DayCellComponent } from './day-cell/day-cell.component';
+
+@Component({
+  selector: 'ngx-calendar',
+  templateUrl: 'calendar.component.html',
+  styleUrls: ['calendar.component.scss'],
+  entryComponents: [DayCellComponent],
+})
+export class CalendarComponent {
+
+  date = new Date();
+  date2 = new Date();
+  range: NbCalendarRange<Date>;
+  dayCellComponent = DayCellComponent;
+
+  constructor(protected dateService: NbDateService<Date>) {
+    this.range = {
+      start: this.dateService.addDay(this.monthStart, 3),
+      end: this.dateService.addDay(this.monthEnd, -3),
+    };
+  }
+
+  get monthStart(): Date {
+    return this.dateService.getMonthStart(new Date());
+  }
+
+  get monthEnd(): Date {
+    return this.dateService.getMonthEnd(new Date());
+  }
+}
diff --git a/src/app/pages/nebular/calundar/day-cell/day-cell.component.html b/src/app/pages/nebular/calundar/day-cell/day-cell.component.html
new file mode 100644
index 0000000000..8bd3809c39
--- /dev/null
+++ b/src/app/pages/nebular/calundar/day-cell/day-cell.component.html
@@ -0,0 +1,4 @@
+<div>
+  <div>{{ day }}</div>
+  <span>{{ (day + 100) * day }}$</span>
+</div>
diff --git a/src/app/pages/nebular/calundar/day-cell/day-cell.component.scss b/src/app/pages/nebular/calundar/day-cell/day-cell.component.scss
new file mode 100644
index 0000000000..61449068ea
--- /dev/null
+++ b/src/app/pages/nebular/calundar/day-cell/day-cell.component.scss
@@ -0,0 +1,10 @@
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  text-align: center;
+
+  span {
+    font-size: 75%;
+    opacity: 0.75;
+  }
+}
diff --git a/src/app/pages/nebular/calundar/day-cell/day-cell.component.ts b/src/app/pages/nebular/calundar/day-cell/day-cell.component.ts
new file mode 100644
index 0000000000..d6d821b399
--- /dev/null
+++ b/src/app/pages/nebular/calundar/day-cell/day-cell.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import { NbCalendarDayCellComponent } from '@nebular/theme';
+
+@Component({
+  selector: 'ngx-day-cell',
+  templateUrl: 'day-cell.component.html',
+  styleUrls: ['day-cell.component.scss'],
+  host: { '(click)': 'onClick()', 'class': 'day-cell' },
+})
+export class DayCellComponent extends NbCalendarDayCellComponent<Date> {
+}
diff --git a/src/app/pages/nebular/datepicker/datepicker.component.html b/src/app/pages/nebular/datepicker/datepicker.component.html
new file mode 100644
index 0000000000..e4a51c3a06
--- /dev/null
+++ b/src/app/pages/nebular/datepicker/datepicker.component.html
@@ -0,0 +1,24 @@
+<nb-card>
+  <nb-card-header>
+    Datepicker
+  </nb-card-header>
+  <nb-card-body>
+    <div>
+      <input nbInput
+             placeholder="Form Picker"
+             [nbDatepicker]="formpicker">
+      <nb-datepicker #formpicker></nb-datepicker>
+    </div>
+    <div>
+      <input nbInput placeholder="Form Picker" [nbDatepicker]="formcontrol" [formControl]="formControl">
+      <nb-datepicker #formcontrol></nb-datepicker>
+
+      <input nbInput placeholder="Form Picker" [nbDatepicker]="ngmodel" [(ngModel)]="ngModelDate">
+      <nb-datepicker #ngmodel></nb-datepicker>
+    </div>
+    <div>
+      <input nbInput placeholder="Form Picker" [nbDatepicker]="picker">
+      <nb-datepicker #picker [min]="min" [max]="max"></nb-datepicker>
+    </div>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/nebular/datepicker/datepicker.component.scss b/src/app/pages/nebular/datepicker/datepicker.component.scss
new file mode 100644
index 0000000000..4ca27cae36
--- /dev/null
+++ b/src/app/pages/nebular/datepicker/datepicker.component.scss
@@ -0,0 +1,17 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+
+  nb-card-body {
+    display: flex;
+    justify-content: space-between;
+
+/*    & > div {
+      margin-left: 5rem;
+
+      &:first-child {
+        margin-left: 0;
+      }
+    }*/
+  }
+}
diff --git a/src/app/pages/nebular/datepicker/datepicker.component.ts b/src/app/pages/nebular/datepicker/datepicker.component.ts
new file mode 100644
index 0000000000..b436370ef1
--- /dev/null
+++ b/src/app/pages/nebular/datepicker/datepicker.component.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { NbDateService } from '@nebular/theme';
+
+@Component({
+  selector: 'ngx-datepicker',
+  templateUrl: 'datepicker.component.html',
+  styleUrls: ['datepicker.component.scss'],
+})
+export class DatepickerComponent {
+
+  min: Date;
+  max: Date;
+  formControl = new FormControl(new Date());
+  ngModelDate = new Date();
+
+  constructor(protected dateService: NbDateService<Date>) {
+    this.min = this.dateService.addDay(this.dateService.today(), -5);
+    this.max = this.dateService.addDay(this.dateService.today(), 5);
+  }
+}
diff --git a/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.html b/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.html
new file mode 100644
index 0000000000..5743ad8699
--- /dev/null
+++ b/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.html
@@ -0,0 +1,10 @@
+<nb-card>
+  <nb-card-header>Enter your name</nb-card-header>
+  <nb-card-body>
+    <input #name nbInput placeholder="Name">
+  </nb-card-body>
+  <nb-card-footer>
+    <button nbButton hero status="danget" (click)="cancel()">Cancel</button>
+    <button nbButton hero status="success" (click)="submit(name.value)">Submit</button>
+  </nb-card-footer>
+</nb-card>
diff --git a/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.scss b/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.scss
new file mode 100644
index 0000000000..b447a8ce61
--- /dev/null
+++ b/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.scss
@@ -0,0 +1,4 @@
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+}
diff --git a/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.ts b/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.ts
new file mode 100644
index 0000000000..5450b9d888
--- /dev/null
+++ b/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.ts
@@ -0,0 +1,20 @@
+import { Component } from '@angular/core';
+import { NbDialogRef } from '@nebular/theme';
+
+@Component({
+  selector: 'ngx-dialog-name-prompt',
+  templateUrl: 'dialog-name-prompt.component.html',
+  styleUrls: ['dialog-name-prompt.component.scss'],
+})
+export class DialogNamePromptComponent {
+
+  constructor(protected ref: NbDialogRef<DialogNamePromptComponent>) {}
+
+  cancel() {
+    this.ref.close();
+  }
+
+  submit(name) {
+    this.ref.close(name);
+  }
+}
diff --git a/src/app/pages/nebular/dialog/dialog.component.html b/src/app/pages/nebular/dialog/dialog.component.html
new file mode 100644
index 0000000000..ade93c67ed
--- /dev/null
+++ b/src/app/pages/nebular/dialog/dialog.component.html
@@ -0,0 +1,45 @@
+<nb-card>
+  <nb-card-header>
+    Dialog
+  </nb-card-header>
+  <nb-card-body>
+    <div>
+      <button nbButton (click)="open()">Open Dialog</button>
+    </div>
+
+    <div>
+      <button nbButton (click)="open2(dialog)">Open Dialog with template</button>
+    </div>
+
+    <div>
+      <button nbButton hero status="primary" (click)="open3()">Enter Name</button>
+      <br>
+      <h3>Names:</h3>
+      <ul>
+        <li *ngFor="let name of names">{{ name }}</li>
+      </ul>
+    </div>
+
+    <div>
+      <button nbButton hero (click)="openWithoutBackdrop(dialog)">Open without backdrop</button>
+    </div>
+
+    <div>
+      <button nbButton hero (click)="openWithoutBackdropClick(dialog)">Open without backdrop</button>
+    </div>
+
+    <div>
+      <button nbButton hero (click)="openWithoutEscClose(dialog)">Open without backdrop</button>
+    </div>
+
+    <ng-template #dialog let-data let-ref="dialogRef">
+      <nb-card>
+        <nb-card-header>Template Dialog</nb-card-header>
+        <nb-card-body>{{ data }}</nb-card-body>
+        <nb-card-footer>
+          <button nbButton (click)="ref.close()">Close Dialog</button>
+        </nb-card-footer>
+      </nb-card>
+    </ng-template>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/nebular/dialog/dialog.component.scss b/src/app/pages/nebular/dialog/dialog.component.scss
new file mode 100644
index 0000000000..df3983ede6
--- /dev/null
+++ b/src/app/pages/nebular/dialog/dialog.component.scss
@@ -0,0 +1,8 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  nb-card-body {
+    display: flex;
+    justify-content: space-between;
+  }
+}
diff --git a/src/app/pages/nebular/dialog/dialog.component.ts b/src/app/pages/nebular/dialog/dialog.component.ts
new file mode 100644
index 0000000000..21044a068b
--- /dev/null
+++ b/src/app/pages/nebular/dialog/dialog.component.ts
@@ -0,0 +1,62 @@
+import { Component, TemplateRef } from '@angular/core';
+import { NbDialogService } from '@nebular/theme';
+import { ShowcaseDialogComponent } from './showcase-dialog/showcase-dialog.component';
+import { DialogNamePromptComponent } from './dialog-name-prompt/dialog-name-prompt.component';
+
+@Component({
+  selector: 'ngx-dialog',
+  templateUrl: 'dialog.component.html',
+  styleUrls: ['dialog.component.scss'],
+})
+export class DialogComponent {
+
+  names: string[] = [];
+
+  constructor(private dialogService: NbDialogService) {}
+
+  open() {
+    this.dialogService.open(ShowcaseDialogComponent, {
+      context: {
+        title: 'This is a title passed to the dialog component',
+      },
+    });
+  }
+
+  open2(dialog: TemplateRef<any>) {
+    this.dialogService.open(
+      dialog,
+      { context: 'this is some additional data passed to dialog' });
+  }
+
+  open3() {
+    this.dialogService.open(DialogNamePromptComponent)
+      .onClose.subscribe(name => name && this.names.push(name));
+  }
+
+  openWithoutBackdrop(dialog: TemplateRef<any>) {
+    this.dialogService.open(
+      dialog,
+      {
+        context: 'this is some additional data passed to dialog',
+        hasBackdrop: false,
+      });
+  }
+
+  openWithoutBackdropClick(dialog: TemplateRef<any>) {
+    this.dialogService.open(
+      dialog,
+      {
+        context: 'this is some additional data passed to dialog',
+        closeOnBackdropClick: false,
+      });
+  }
+
+  openWithoutEscClose(dialog: TemplateRef<any>) {
+    this.dialogService.open(
+      dialog,
+      {
+        context: 'this is some additional data passed to dialog',
+        closeOnEsc: false,
+      });
+  }
+}
diff --git a/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.html b/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.html
new file mode 100644
index 0000000000..403a979220
--- /dev/null
+++ b/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.html
@@ -0,0 +1,14 @@
+<nb-card [style.width.px]="600" [style.height.px]="500">
+  <nb-card-header>{{ title }}</nb-card-header>
+  <nb-card-body>
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras convallis tincidunt tincidunt.
+    Vestibulum vulputate maximus massa vel tristique. Suspendisse potenti. Duis aliquet purus sed dictum dictum.
+    Donec fringilla, purus at fermentum imperdiet, velit enim malesuada turpis, quis luctus arcu arcu nec orci.
+    Duis eu mattis felis. Quisque sollicitudin elementum nunc vel tincidunt. Vestibulum egestas mi nec
+    iaculis varius. Morbi in risus sed sapien ultricies feugiat. Quisque pulvinar mattis purus,
+    in aliquet massa aliquet et.
+  </nb-card-body>
+  <nb-card-footer>
+    <button nbButton hero status="primary" (click)="dismiss()">Dismiss Dialog</button>
+  </nb-card-footer>
+</nb-card>
diff --git a/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.scss b/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.scss
new file mode 100644
index 0000000000..b447a8ce61
--- /dev/null
+++ b/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.scss
@@ -0,0 +1,4 @@
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+}
diff --git a/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.ts b/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.ts
new file mode 100644
index 0000000000..1f40db2c09
--- /dev/null
+++ b/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.ts
@@ -0,0 +1,18 @@
+import { Component, Input } from '@angular/core';
+import { NbDialogRef } from '@nebular/theme';
+
+@Component({
+  selector: 'ngx-showcase-dialog',
+  templateUrl: 'showcase-dialog.component.html',
+  styleUrls: ['showcase-dialog.component.scss'],
+})
+export class ShowcaseDialogComponent {
+
+  @Input() title: string;
+
+  constructor(protected ref: NbDialogRef<ShowcaseDialogComponent>) {}
+
+  dismiss() {
+    this.ref.close();
+  }
+}
diff --git a/src/app/pages/nebular/nebular-routing.module.ts b/src/app/pages/nebular/nebular-routing.module.ts
new file mode 100644
index 0000000000..d04ce1db54
--- /dev/null
+++ b/src/app/pages/nebular/nebular-routing.module.ts
@@ -0,0 +1,45 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { NebularComponent } from './nebular.component';
+import { CalendarComponent } from './calundar/calendar.component';
+import { StepperComponent } from './stepper/stepper.component';
+import { AccordionComponent } from './accordion/accordion.component';
+import { DatepickerComponent } from './datepicker/datepicker.component';
+import { DialogComponent } from './dialog/dialog.component';
+
+const routes: Routes = [{
+  path: '',
+  component: NebularComponent,
+  children: [
+    {
+      path: 'calendar',
+      component: CalendarComponent,
+    },
+    {
+      path: 'datepicker',
+      component: DatepickerComponent,
+    },
+    {
+      path: 'stepper',
+      component: StepperComponent,
+    },
+    {
+      path: 'accordion',
+      component: AccordionComponent,
+    },
+    {
+      path: 'dialog',
+      component: DialogComponent,
+    },
+  ],
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class NebularRoutingModule {
+}
+
+
diff --git a/src/app/pages/nebular/nebular.component.ts b/src/app/pages/nebular/nebular.component.ts
new file mode 100644
index 0000000000..ed4bf61973
--- /dev/null
+++ b/src/app/pages/nebular/nebular.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-nebular',
+  template: `
+    <router-outlet></router-outlet>
+  `,
+})
+
+export class NebularComponent {
+}
diff --git a/src/app/pages/nebular/nebular.module.ts b/src/app/pages/nebular/nebular.module.ts
new file mode 100644
index 0000000000..928e084c74
--- /dev/null
+++ b/src/app/pages/nebular/nebular.module.ts
@@ -0,0 +1,55 @@
+import { NgModule } from '@angular/core';
+
+// modules
+import { ThemeModule } from '../../@theme/theme.module';
+import { NebularRoutingModule } from './nebular-routing.module';
+
+// components
+import { NebularComponent } from './nebular.component';
+import { CalendarComponent } from './calundar/calendar.component';
+import { DayCellComponent } from './calundar/day-cell/day-cell.component';
+import { StepperComponent } from './stepper/stepper.component';
+import { AccordionComponent } from './accordion/accordion.component';
+import { DatepickerComponent } from './datepicker/datepicker.component';
+import { DialogComponent } from './dialog/dialog.component';
+import { ShowcaseDialogComponent } from './dialog/showcase-dialog/showcase-dialog.component';
+import { NbDialogModule } from '@nebular/theme';
+import { DialogNamePromptComponent } from './dialog/dialog-name-prompt/dialog-name-prompt.component';
+
+const COMPONENTS = [
+  NebularComponent,
+  CalendarComponent,
+  DayCellComponent,
+  StepperComponent,
+  AccordionComponent,
+  DatepickerComponent,
+  DialogComponent,
+  ShowcaseDialogComponent,
+  DialogNamePromptComponent,
+];
+
+const ENTRY_COMPONENTS = [
+  ShowcaseDialogComponent,
+  DialogNamePromptComponent,
+];
+
+
+const MODULES = [
+  ThemeModule,
+  NebularRoutingModule,
+  NbDialogModule.forChild(),
+];
+
+@NgModule({
+  imports: [
+    ...MODULES,
+  ],
+  declarations: [
+    ...COMPONENTS,
+  ],
+  entryComponents: [
+    ...ENTRY_COMPONENTS,
+  ],
+})
+export class NebularModule {
+}
diff --git a/src/app/pages/nebular/stepper/stepper.component.html b/src/app/pages/nebular/stepper/stepper.component.html
new file mode 100644
index 0000000000..cad4c04ea8
--- /dev/null
+++ b/src/app/pages/nebular/stepper/stepper.component.html
@@ -0,0 +1,139 @@
+<nb-card>
+  <nb-card-body>
+    <nb-stepper orientation="horizontal">
+      <nb-step [label]="labelOne">
+        <ng-template #labelOne>First step</ng-template>
+        <h3>Step content #1</h3>
+        <button nbButton disabled nbStepperNext>prev</button>
+        <button nbButton nbStepperNext>next</button>
+      </nb-step>
+      <nb-step [label]="labelTwo">
+        <ng-template #labelTwo>Second step</ng-template>
+        <h3>Step content #2</h3>
+        <button nbButton nbStepperPrevious>prev</button>
+        <button nbButton nbStepperNext>next</button>
+      </nb-step>
+      <nb-step label="Third step">
+        <h3>Step content #3</h3>
+        <button nbButton nbStepperPrevious>prev</button>
+        <button nbButton nbStepperNext>next</button>
+      </nb-step>
+      <nb-step [label]="labelFour">
+        <ng-template #labelFour>Fourth step</ng-template>
+        <h3>Step content #4</h3>
+        <button nbButton nbStepperPrevious>prev</button>
+        <button nbButton disabled nbStepperNext>next</button>
+      </nb-step>
+    </nb-stepper>
+  </nb-card-body>
+</nb-card>
+
+<div class="steppers-container">
+  <nb-card>
+    <nb-card-body>
+      <nb-stepper #stepper>
+        <nb-step [stepControl]="firstForm" label="First step">
+          <form [formGroup]="firstForm" (ngSubmit)="onFirstSubmit()" class="step-container">
+            <p class="lorem">
+              Lorizzle ipsum dolizzle stuff fizzle, consectetuer adipiscing break it down. Nullizzle sapien velizzle,
+              my shizz pimpin', shizzle my nizzle crocodizzle shut the shizzle up, gravida vizzle, dang.
+            </p>
+            <div class="input-group">
+              <input type="text" placeholder="Enter your name" class="form-control" formControlName="firstCtrl"
+                     [ngClass]="{'form-control-danger': firstForm.invalid && (firstForm.dirty || firstForm.touched)}">
+            </div>
+            <button nbButton nbStepperNext>next</button>
+          </form>
+        </nb-step>
+        <nb-step [stepControl]="secondForm" label="Second step">
+          <form [formGroup]="secondForm" (ngSubmit)="onSecondSubmit()" class="step-container">
+            <p class="lorem">
+              Pellentesque we gonna chung tortor.
+              Sizzle pizzle. Fizzle izzle dolor dapibus fo shizzle mah nizzle fo rizzle, mah home g-dizzle tempus tempor.
+              Maurizzle cool nibh owned turpizzle. My shizz fo shizzle tortor.
+            </p>
+            <div class="input-group">
+              <input type="text" placeholder="Enter favorite movie" class="form-control" formControlName="secondCtrl"
+                     [ngClass]="{'form-control-danger': secondForm.invalid && (secondForm.dirty || secondForm.touched)}">
+            </div>
+            <button nbButton nbStepperPrevious>prev</button>
+            <button nbButton nbStepperNext>next</button>
+          </form>
+        </nb-step>
+        <nb-step [stepControl]="thirdForm" label="Third step">
+          <form [formGroup]="thirdForm" (ngSubmit)="onThirdSubmit()" class="step-container">
+            <p class="lorem">
+              Things boom shackalack rhoncus yo. In fo shizzle my nizzle gangsta platea dictumst. Check it out pot.
+            </p>
+            <div class="input-group">
+              <input type="text" placeholder="Enter something" class="form-control" formControlName="thirdCtrl"
+                     [ngClass]="{'form-control-danger': thirdForm.invalid && (thirdForm.dirty || thirdForm.touched)}">
+            </div>
+            <button nbButton nbStepperPrevious>prev</button>
+            <button nbButton nbStepperNext>Confirm</button>
+          </form>
+        </nb-step>
+        <nb-step [stepControl]="thirdForm" [hidden]="true" label="Third step">
+          <div class="step-container">
+            <h3>Wizard completed!</h3>
+            <button nbButton (click)="stepper.reset()">Try again</button>
+          </div>
+        </nb-step>
+      </nb-stepper>
+    </nb-card-body>
+  </nb-card>
+
+  <nb-card size="medium">
+    <nb-card-body>
+      <nb-stepper orientation="vertical">
+        <nb-step label="First step">
+          <h3>Step content #1</h3>
+          <p class="lorem">
+            Proin varius accumsan semper. Praesent consequat tincidunt sagittis. Curabitur egestas sem a ipsum bibendum,
+            sit amet fringilla orci efficitur. Nam bibendum lectus ut viverra tristique. Fusce eu pulvinar magna, quis
+            viverra ex. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent metus turpis, commodo vel
+            placerat quis, lobortis in ligula.
+          </p>
+          <button nbButton disabled nbStepperNext>prev</button>
+          <button nbButton nbStepperNext>next</button>
+        </nb-step>
+        <nb-step label="Second step">
+          <h3>Step content #2</h3>
+          <p class="lorem">
+            Curabitur luctus mattis risus nec condimentum. Donec at dui turpis. Sed vehicula fringilla rutrum. Nullam
+            sed ornare magna. Mauris vitae laoreet diam. Mauris fermentum ligula at lacinia semper. Nulla placerat dui
+            eu sapien pellentesque, eu placerat leo luctus. Cras pharetra blandit fermentum.
+          </p>
+          <button nbButton nbStepperPrevious>prev</button>
+          <button nbButton nbStepperNext>next</button>
+        </nb-step>
+        <nb-step label="Third step">
+          <h3>Step content #3</h3>
+          <p class="lorem">
+            Proin varius accumsan semper. Praesent consequat tincidunt sagittis. Curabitur egestas sem a ipsum bibendum,
+            sit amet fringilla orci efficitur. Nam bibendum lectus ut viverra tristique. Fusce eu pulvinar magna, quis
+            viverra ex. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent metus turpis, commodo vel
+            placerat quis, lobortis in ligula.
+          </p>
+          <p class="lorem">
+            Curabitur luctus mattis risus nec condimentum. Donec at dui turpis. Sed vehicula fringilla rutrum. Nullam
+            sed ornare magna. Mauris vitae laoreet diam. Mauris fermentum ligula at lacinia semper. Nulla placerat dui
+            eu sapien pellentesque, eu placerat leo luctus. Cras pharetra blandit fermentum.
+          </p>
+          <button nbButton nbStepperPrevious>prev</button>
+          <button nbButton nbStepperNext>next</button>
+        </nb-step>
+        <nb-step label="Fourth step">
+          <h3>Step content #4</h3>
+          <p class="lorem">
+            Proin varius accumsan semper. Praesent consequat tincidunt sagittis. Curabitur egestas sem a ipsum bibendum,
+            sit amet fringilla orci efficitur. Nam bibendum lectus ut viverra tristique. Fusce eu pulvinar magna, quis
+            viverra ex.
+          </p>
+          <button nbButton nbStepperPrevious>prev</button>
+          <button nbButton disabled nbStepperNext>next</button>
+        </nb-step>
+      </nb-stepper>
+    </nb-card-body>
+  </nb-card>
+</div>
diff --git a/src/app/pages/nebular/stepper/stepper.component.scss b/src/app/pages/nebular/stepper/stepper.component.scss
new file mode 100644
index 0000000000..4c12321127
--- /dev/null
+++ b/src/app/pages/nebular/stepper/stepper.component.scss
@@ -0,0 +1,24 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  /deep/ nb-stepper .step-content {
+    text-align: center;
+
+    button {
+      cursor: pointer;
+      margin: 0.5rem;
+    }
+  }
+
+  .steppers-container {
+    display: flex;
+
+    nb-card {
+      flex: 1;
+
+      &:not(:first-child) {
+        margin-left: 1rem;
+      }
+    }
+  }
+}
diff --git a/src/app/pages/nebular/stepper/stepper.component.ts b/src/app/pages/nebular/stepper/stepper.component.ts
new file mode 100644
index 0000000000..c9a7212c9f
--- /dev/null
+++ b/src/app/pages/nebular/stepper/stepper.component.ts
@@ -0,0 +1,43 @@
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+
+@Component({
+  selector: 'ngx-stepper',
+  templateUrl: 'stepper.component.html',
+  styleUrls: ['stepper.component.scss'],
+})
+export class StepperComponent implements OnInit {
+
+  firstForm: FormGroup;
+  secondForm: FormGroup;
+  thirdForm: FormGroup;
+
+  constructor(private fb: FormBuilder) {
+  }
+
+  ngOnInit() {
+    this.firstForm = this.fb.group({
+      firstCtrl: ['', Validators.required],
+    });
+
+    this.secondForm = this.fb.group({
+      secondCtrl: ['', Validators.required],
+    });
+
+    this.thirdForm = this.fb.group({
+      thirdCtrl: ['', Validators.required],
+    });
+  }
+
+  onFirstSubmit() {
+    this.firstForm.markAsDirty();
+  }
+
+  onSecondSubmit() {
+    this.secondForm.markAsDirty();
+  }
+
+  onThirdSubmit() {
+    this.thirdForm.markAsDirty();
+  }
+}
diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts
index f29914c84f..76e5d8a272 100644
--- a/src/app/pages/pages-menu.ts
+++ b/src/app/pages/pages-menu.ts
@@ -16,6 +16,32 @@ export const MENU_ITEMS: NbMenuItem[] = [
     title: 'FEATURES',
     group: true,
   },
+  {
+    title: 'Nebular',
+    icon: 'nb-keypad',
+    children: [
+      {
+        title: 'Calendar',
+        link: '/pages/nebular/calendar',
+      },
+      {
+        title: 'Datepicker',
+        link: '/pages/nebular/datepicker',
+      },
+      {
+        title: 'Stepper',
+        link: '/pages/nebular/stepper',
+      },
+      {
+        title: 'Accordion',
+        link: '/pages/nebular/accordion',
+      },
+      {
+        title: 'Dialog',
+        link: '/pages/nebular/dialog',
+      },
+    ],
+  },
   {
     title: 'UI Features',
     icon: 'nb-keypad',
diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts
index de93b990c2..e59053afb8 100644
--- a/src/app/pages/pages-routing.module.ts
+++ b/src/app/pages/pages-routing.module.ts
@@ -15,6 +15,9 @@ const routes: Routes = [{
   }, {
     path: 'iot-dashboard',
     component: DashboardComponent,
+  }, {
+    path: 'nebular',
+    loadChildren: './nebular/nebular.module#NebularModule',
   }, {
     path: 'ui-features',
     loadChildren: './ui-features/ui-features.module#UiFeaturesModule',

From c756414c2b79b676086d27d81b513f06808a7aac Mon Sep 17 00:00:00 2001
From: Denis Strigo <d.strigo@akveo.com>
Date: Thu, 18 Oct 2018 13:47:55 +0300
Subject: [PATCH 02/11] feat(components): add new nebular window component

---
 src/app/@theme/theme.module.ts                |  6 ++-
 .../dialog-name-prompt.component.html         |  4 +-
 .../dialog-name-prompt.component.scss         |  7 +++
 .../nebular/dialog/dialog.component.html      |  4 +-
 .../nebular/dialog/dialog.component.scss      |  4 ++
 .../pages/nebular/nebular-routing.module.ts   |  5 +++
 src/app/pages/nebular/nebular.module.ts       |  8 +++-
 .../nebular/stepper/stepper.component.scss    |  4 ++
 .../window-form/window-form.component.scss    | 12 ++++++
 .../window-form/window-form.component.ts      | 22 ++++++++++
 .../nebular/window/window.component.html      | 20 +++++++++
 .../nebular/window/window.component.scss      |  7 +++
 .../pages/nebular/window/window.component.ts  | 43 +++++++++++++++++++
 src/app/pages/pages-menu.ts                   |  4 ++
 14 files changed, 144 insertions(+), 6 deletions(-)
 create mode 100644 src/app/pages/nebular/window/window-form/window-form.component.scss
 create mode 100644 src/app/pages/nebular/window/window-form/window-form.component.ts
 create mode 100644 src/app/pages/nebular/window/window.component.html
 create mode 100644 src/app/pages/nebular/window/window.component.scss
 create mode 100644 src/app/pages/nebular/window/window.component.ts

diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts
index 8b7e5126fe..dffef8b0b7 100644
--- a/src/app/@theme/theme.module.ts
+++ b/src/app/@theme/theme.module.ts
@@ -24,7 +24,9 @@ import {
   NbButtonModule,
   NbInputModule,
   NbAccordionModule,
-  NbDatepickerModule, NbDialogModule,
+  NbDatepickerModule,
+  NbDialogModule,
+  NbWindowModule,
 } from '@nebular/theme';
 
 import { NbSecurityModule } from '@nebular/security';
@@ -83,6 +85,7 @@ const NB_MODULES = [
   NbAccordionModule,
   NbDatepickerModule,
   NbDialogModule,
+  NbWindowModule,
 ];
 
 const COMPONENTS = [
@@ -124,6 +127,7 @@ const NB_THEME_PROVIDERS = [
   ...NbMenuModule.forRoot().providers,
   ...NbDatepickerModule.forRoot().providers,
   ...NbDialogModule.forRoot().providers,
+  ...NbWindowModule.forRoot().providers,
 ];
 
 @NgModule({
diff --git a/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.html b/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.html
index 5743ad8699..403d906b3d 100644
--- a/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.html
+++ b/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.html
@@ -4,7 +4,7 @@
     <input #name nbInput placeholder="Name">
   </nb-card-body>
   <nb-card-footer>
-    <button nbButton hero status="danget" (click)="cancel()">Cancel</button>
-    <button nbButton hero status="success" (click)="submit(name.value)">Submit</button>
+    <button nbButton status="danget" (click)="cancel()">Cancel</button>
+    <button nbButton status="success" (click)="submit(name.value)">Submit</button>
   </nb-card-footer>
 </nb-card>
diff --git a/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.scss b/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.scss
index b447a8ce61..f5a3861257 100644
--- a/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.scss
+++ b/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.scss
@@ -1,4 +1,11 @@
 @import '../../../../@theme/styles/themes';
 
 @include nb-install-component() {
+  input {
+    width: 100%;
+  }
+
+  .btn-success {
+    margin-left: 1rem;
+  }
 }
diff --git a/src/app/pages/nebular/dialog/dialog.component.html b/src/app/pages/nebular/dialog/dialog.component.html
index ade93c67ed..75dc8b1203 100644
--- a/src/app/pages/nebular/dialog/dialog.component.html
+++ b/src/app/pages/nebular/dialog/dialog.component.html
@@ -12,9 +12,9 @@
     </div>
 
     <div>
-      <button nbButton hero status="primary" (click)="open3()">Enter Name</button>
+      <button nbButton (click)="open3()">Enter Name</button>
       <br>
-      <h3>Names:</h3>
+      <h3 class="title">Names:</h3>
       <ul>
         <li *ngFor="let name of names">{{ name }}</li>
       </ul>
diff --git a/src/app/pages/nebular/dialog/dialog.component.scss b/src/app/pages/nebular/dialog/dialog.component.scss
index df3983ede6..a9b40a6a45 100644
--- a/src/app/pages/nebular/dialog/dialog.component.scss
+++ b/src/app/pages/nebular/dialog/dialog.component.scss
@@ -5,4 +5,8 @@
     display: flex;
     justify-content: space-between;
   }
+
+  .title {
+    margin-top: 1rem;
+  }
 }
diff --git a/src/app/pages/nebular/nebular-routing.module.ts b/src/app/pages/nebular/nebular-routing.module.ts
index d04ce1db54..cdee99eca4 100644
--- a/src/app/pages/nebular/nebular-routing.module.ts
+++ b/src/app/pages/nebular/nebular-routing.module.ts
@@ -7,6 +7,7 @@ import { StepperComponent } from './stepper/stepper.component';
 import { AccordionComponent } from './accordion/accordion.component';
 import { DatepickerComponent } from './datepicker/datepicker.component';
 import { DialogComponent } from './dialog/dialog.component';
+import { WindowComponent } from './window/window.component';
 
 const routes: Routes = [{
   path: '',
@@ -32,6 +33,10 @@ const routes: Routes = [{
       path: 'dialog',
       component: DialogComponent,
     },
+    {
+      path: 'window',
+      component: WindowComponent,
+    },
   ],
 }];
 
diff --git a/src/app/pages/nebular/nebular.module.ts b/src/app/pages/nebular/nebular.module.ts
index 928e084c74..2351917e60 100644
--- a/src/app/pages/nebular/nebular.module.ts
+++ b/src/app/pages/nebular/nebular.module.ts
@@ -13,8 +13,10 @@ import { AccordionComponent } from './accordion/accordion.component';
 import { DatepickerComponent } from './datepicker/datepicker.component';
 import { DialogComponent } from './dialog/dialog.component';
 import { ShowcaseDialogComponent } from './dialog/showcase-dialog/showcase-dialog.component';
-import { NbDialogModule } from '@nebular/theme';
+import { NbDialogModule, NbWindowModule } from '@nebular/theme';
 import { DialogNamePromptComponent } from './dialog/dialog-name-prompt/dialog-name-prompt.component';
+import { WindowComponent } from './window/window.component';
+import { WindowFormComponent } from './window/window-form/window-form.component';
 
 const COMPONENTS = [
   NebularComponent,
@@ -26,11 +28,14 @@ const COMPONENTS = [
   DialogComponent,
   ShowcaseDialogComponent,
   DialogNamePromptComponent,
+  WindowComponent,
+  WindowFormComponent,
 ];
 
 const ENTRY_COMPONENTS = [
   ShowcaseDialogComponent,
   DialogNamePromptComponent,
+  WindowFormComponent,
 ];
 
 
@@ -38,6 +43,7 @@ const MODULES = [
   ThemeModule,
   NebularRoutingModule,
   NbDialogModule.forChild(),
+  NbWindowModule.forChild(),
 ];
 
 @NgModule({
diff --git a/src/app/pages/nebular/stepper/stepper.component.scss b/src/app/pages/nebular/stepper/stepper.component.scss
index 4c12321127..13db43c0e7 100644
--- a/src/app/pages/nebular/stepper/stepper.component.scss
+++ b/src/app/pages/nebular/stepper/stepper.component.scss
@@ -13,6 +13,10 @@
   .steppers-container {
     display: flex;
 
+    .input-group {
+      margin-bottom: 0.5rem;
+    }
+
     nb-card {
       flex: 1;
 
diff --git a/src/app/pages/nebular/window/window-form/window-form.component.scss b/src/app/pages/nebular/window/window-form/window-form.component.scss
new file mode 100644
index 0000000000..61a7020775
--- /dev/null
+++ b/src/app/pages/nebular/window/window-form/window-form.component.scss
@@ -0,0 +1,12 @@
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  /deep/ .form {
+    display: flex;
+    flex-direction: column;
+
+    .text-label {
+      margin-top: 1.5rem;
+    }
+  }
+}
diff --git a/src/app/pages/nebular/window/window-form/window-form.component.ts b/src/app/pages/nebular/window/window-form/window-form.component.ts
new file mode 100644
index 0000000000..a2b4cddabc
--- /dev/null
+++ b/src/app/pages/nebular/window/window-form/window-form.component.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { NbWindowRef } from '@nebular/theme';
+
+@Component({
+  template: `
+    <form class="form">
+      <label for="subject">Subject:</label>
+      <input nbInput id="subject" type="text">
+
+      <label class="text-label" for="text">Text:</label>
+      <textarea nbInput id="text"></textarea>
+    </form>
+  `,
+  styleUrls: ['window-form.component.scss'],
+})
+export class WindowFormComponent {
+  constructor(public windowRef: NbWindowRef) {}
+
+  close() {
+    this.windowRef.close();
+  }
+}
diff --git a/src/app/pages/nebular/window/window.component.html b/src/app/pages/nebular/window/window.component.html
new file mode 100644
index 0000000000..6be2da9cbe
--- /dev/null
+++ b/src/app/pages/nebular/window/window.component.html
@@ -0,0 +1,20 @@
+<nb-card>
+  <nb-card-header>
+    Window
+  </nb-card-header>
+  <nb-card-body>
+    <button (click)="openWindowForm()" nbButton>Open window form</button>
+
+    <button (click)="openWindow(contentTemplate)" nbButton>Open window</button>
+
+    <button (click)="openWindowWithoutBackdrop()" nbButton>Open window without backdrop</button>
+  </nb-card-body>
+</nb-card>
+
+<ng-template #contentTemplate let-data>
+  <p>Here is the text provided via config: "{{ data.title }}"</p>
+</ng-template>
+
+<ng-template #disabledEsc>
+  Disabled close on escape click.
+</ng-template>
diff --git a/src/app/pages/nebular/window/window.component.scss b/src/app/pages/nebular/window/window.component.scss
new file mode 100644
index 0000000000..b8992e89ef
--- /dev/null
+++ b/src/app/pages/nebular/window/window.component.scss
@@ -0,0 +1,7 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  button + button {
+    margin-left: 2rem;
+  }
+}
diff --git a/src/app/pages/nebular/window/window.component.ts b/src/app/pages/nebular/window/window.component.ts
new file mode 100644
index 0000000000..71665f736d
--- /dev/null
+++ b/src/app/pages/nebular/window/window.component.ts
@@ -0,0 +1,43 @@
+import { Component, TemplateRef, ViewChild } from '@angular/core';
+import { NbWindowService } from '@nebular/theme';
+import { WindowFormComponent } from './window-form/window-form.component';
+
+@Component({
+  selector: 'ngx-window',
+  templateUrl: 'window.component.html',
+  styleUrls: ['window.component.scss'],
+})
+export class WindowComponent {
+
+  @ViewChild('contentTemplate') contentTemplate: TemplateRef<any>;
+  @ViewChild('disabledEsc', { read: TemplateRef }) disabledEscTemplate: TemplateRef<HTMLElement>;
+
+  constructor(private windowService: NbWindowService) {}
+
+  openWindow(contentTemplate) {
+    this.windowService.open(
+      contentTemplate,
+      {
+        title: 'Window content from template',
+        context: {
+          text: 'some text to pass into template',
+        },
+      },
+    );
+  }
+
+  openWindowForm() {
+    this.windowService.open(WindowFormComponent, { title: `Window` });
+  }
+
+  openWindowWithoutBackdrop() {
+    this.windowService.open(
+      this.disabledEscTemplate,
+      {
+        title: 'Window without backdrop',
+        hasBackdrop: false,
+        closeOnEsc: false,
+      },
+    );
+  }
+}
diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts
index 76e5d8a272..7575482efa 100644
--- a/src/app/pages/pages-menu.ts
+++ b/src/app/pages/pages-menu.ts
@@ -40,6 +40,10 @@ export const MENU_ITEMS: NbMenuItem[] = [
         title: 'Dialog',
         link: '/pages/nebular/dialog',
       },
+      {
+        title: 'Window',
+        link: '/pages/nebular/window',
+      },
     ],
   },
   {

From ca5089894427b2d4980f3c5fea75d8c6f4fe055b Mon Sep 17 00:00:00 2001
From: Denis Strigo <d.strigo@akveo.com>
Date: Thu, 18 Oct 2018 14:00:04 +0300
Subject: [PATCH 03/11] feat(package): update nebular icons package

---
 package-lock.json | 5644 ++++++++++++++++++++++-----------------------
 package.json      |    2 +-
 2 files changed, 2823 insertions(+), 2823 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad6d4ce679..460f5e715a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
       "dev": true,
       "requires": {
         "@angular-devkit/core": "0.6.0",
-        "rxjs": "^6.0.0"
+        "rxjs": "6.1.0"
       }
     },
     "@angular-devkit/build-angular": {
@@ -29,53 +29,53 @@
         "@angular-devkit/build-optimizer": "0.6.0",
         "@angular-devkit/core": "0.6.0",
         "@ngtools/webpack": "6.0.0",
-        "ajv": "~6.4.0",
-        "autoprefixer": "^8.1.0",
-        "cache-loader": "^1.2.2",
-        "chalk": "~2.2.2",
-        "circular-dependency-plugin": "^5.0.2",
-        "clean-css": "^4.1.11",
-        "copy-webpack-plugin": "^4.5.1",
-        "file-loader": "^1.1.11",
-        "glob": "^7.0.3",
-        "html-webpack-plugin": "^3.0.6",
-        "istanbul": "^0.4.5",
-        "istanbul-instrumenter-loader": "^3.0.1",
-        "karma-source-map-support": "^1.2.0",
-        "less": "^3.0.2",
-        "less-loader": "^4.1.0",
-        "license-webpack-plugin": "^1.3.1",
-        "lodash": "^4.17.4",
-        "memory-fs": "^0.4.1",
-        "mini-css-extract-plugin": "~0.4.0",
-        "minimatch": "^3.0.4",
-        "node-sass": "^4.8.3",
-        "opn": "^5.1.0",
-        "parse5": "^4.0.0",
-        "portfinder": "^1.0.13",
-        "postcss": "^6.0.19",
-        "postcss-import": "^11.1.0",
-        "postcss-loader": "^2.1.4",
-        "postcss-url": "^7.3.1",
-        "raw-loader": "^0.5.1",
-        "resolve": "^1.5.0",
-        "rxjs": "^6.0.0",
-        "sass-loader": "^7.0.1",
-        "silent-error": "^1.1.0",
-        "source-map-support": "^0.5.0",
-        "stats-webpack-plugin": "^0.6.2",
-        "style-loader": "^0.21.0",
-        "stylus": "^0.54.5",
-        "stylus-loader": "^3.0.2",
-        "tree-kill": "^1.2.0",
-        "uglifyjs-webpack-plugin": "^1.2.5",
-        "url-loader": "^1.0.1",
-        "webpack": "~4.6.0",
-        "webpack-dev-middleware": "^3.1.3",
-        "webpack-dev-server": "^3.1.4",
-        "webpack-merge": "^4.1.2",
-        "webpack-sources": "^1.1.0",
-        "webpack-subresource-integrity": "^1.1.0-rc.4"
+        "ajv": "6.4.0",
+        "autoprefixer": "8.4.1",
+        "cache-loader": "1.2.2",
+        "chalk": "2.2.2",
+        "circular-dependency-plugin": "5.0.2",
+        "clean-css": "4.1.11",
+        "copy-webpack-plugin": "4.5.1",
+        "file-loader": "1.1.11",
+        "glob": "7.1.2",
+        "html-webpack-plugin": "3.2.0",
+        "istanbul": "0.4.5",
+        "istanbul-instrumenter-loader": "3.0.1",
+        "karma-source-map-support": "1.3.0",
+        "less": "3.0.4",
+        "less-loader": "4.1.0",
+        "license-webpack-plugin": "1.3.1",
+        "lodash": "4.17.5",
+        "memory-fs": "0.4.1",
+        "mini-css-extract-plugin": "0.4.0",
+        "minimatch": "3.0.4",
+        "node-sass": "4.9.0",
+        "opn": "5.1.0",
+        "parse5": "4.0.0",
+        "portfinder": "1.0.13",
+        "postcss": "6.0.22",
+        "postcss-import": "11.1.0",
+        "postcss-loader": "2.1.5",
+        "postcss-url": "7.3.2",
+        "raw-loader": "0.5.1",
+        "resolve": "1.5.0",
+        "rxjs": "6.1.0",
+        "sass-loader": "7.0.1",
+        "silent-error": "1.1.0",
+        "source-map-support": "0.5.5",
+        "stats-webpack-plugin": "0.6.2",
+        "style-loader": "0.21.0",
+        "stylus": "0.54.5",
+        "stylus-loader": "3.0.2",
+        "tree-kill": "1.2.0",
+        "uglifyjs-webpack-plugin": "1.2.5",
+        "url-loader": "1.0.1",
+        "webpack": "4.6.0",
+        "webpack-dev-middleware": "3.1.3",
+        "webpack-dev-server": "3.1.4",
+        "webpack-merge": "4.1.2",
+        "webpack-sources": "1.1.0",
+        "webpack-subresource-integrity": "1.1.0-rc.4"
       },
       "dependencies": {
         "ajv": {
@@ -84,10 +84,10 @@
           "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0",
-            "uri-js": "^3.0.2"
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1",
+            "uri-js": "3.0.2"
           }
         },
         "parse5": {
@@ -108,8 +108,8 @@
           "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==",
           "dev": true,
           "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
+            "buffer-from": "1.0.0",
+            "source-map": "0.6.1"
           }
         }
       }
@@ -120,10 +120,10 @@
       "integrity": "sha512-XV6NEf5G3iuXnIUpvSuwGSyTkIP5muS4NKbOWFpqqQhbQ0jacJ9KC3uXSBITD7zZD8ywA3Yq84mPl8c9pLKyXw==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "source-map": "^0.5.6",
-        "typescript": "~2.7.2",
-        "webpack-sources": "^1.1.0"
+        "loader-utils": "1.1.0",
+        "source-map": "0.5.7",
+        "typescript": "2.7.2",
+        "webpack-sources": "1.1.0"
       }
     },
     "@angular-devkit/core": {
@@ -132,10 +132,10 @@
       "integrity": "sha512-hM1AOSF/+XZpv350pODPgoO/2QL61tfRlCXf3u4zHxkXdcboFKGCIi7VEu7TYMWSQzujcTFJciVBrgf/IfQ3cA==",
       "dev": true,
       "requires": {
-        "ajv": "~6.4.0",
-        "chokidar": "^2.0.3",
-        "rxjs": "^6.0.0",
-        "source-map": "^0.5.6"
+        "ajv": "6.4.0",
+        "chokidar": "2.0.3",
+        "rxjs": "6.1.0",
+        "source-map": "0.5.7"
       },
       "dependencies": {
         "ajv": {
@@ -144,10 +144,10 @@
           "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0",
-            "uri-js": "^3.0.2"
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1",
+            "uri-js": "3.0.2"
           }
         },
         "anymatch": {
@@ -156,8 +156,8 @@
           "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
           "dev": true,
           "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
+            "micromatch": "3.1.10",
+            "normalize-path": "2.1.1"
           }
         },
         "arr-diff": {
@@ -178,16 +178,16 @@
           "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
+            "arr-flatten": "1.1.0",
+            "array-unique": "0.3.2",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.2",
+            "snapdragon": "0.8.2",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "extend-shallow": {
@@ -196,7 +196,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -207,18 +207,18 @@
           "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
           "dev": true,
           "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.1.2",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^2.1.1",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.0"
+            "anymatch": "2.0.0",
+            "async-each": "1.0.1",
+            "braces": "2.3.2",
+            "fsevents": "1.2.4",
+            "glob-parent": "3.1.0",
+            "inherits": "2.0.3",
+            "is-binary-path": "1.0.1",
+            "is-glob": "4.0.0",
+            "normalize-path": "2.1.1",
+            "path-is-absolute": "1.0.1",
+            "readdirp": "2.1.0",
+            "upath": "1.0.5"
           }
         },
         "expand-brackets": {
@@ -227,13 +227,13 @@
           "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
           "dev": true,
           "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "define-property": {
@@ -242,7 +242,7 @@
               "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
               "dev": true,
               "requires": {
-                "is-descriptor": "^0.1.0"
+                "is-descriptor": "0.1.6"
               }
             },
             "extend-shallow": {
@@ -251,7 +251,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             },
             "is-accessor-descriptor": {
@@ -260,7 +260,7 @@
               "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
               "dev": true,
               "requires": {
-                "kind-of": "^3.0.2"
+                "kind-of": "3.2.2"
               },
               "dependencies": {
                 "kind-of": {
@@ -269,7 +269,7 @@
                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                   "dev": true,
                   "requires": {
-                    "is-buffer": "^1.1.5"
+                    "is-buffer": "1.1.6"
                   }
                 }
               }
@@ -280,7 +280,7 @@
               "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
               "dev": true,
               "requires": {
-                "kind-of": "^3.0.2"
+                "kind-of": "3.2.2"
               },
               "dependencies": {
                 "kind-of": {
@@ -289,7 +289,7 @@
                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                   "dev": true,
                   "requires": {
-                    "is-buffer": "^1.1.5"
+                    "is-buffer": "1.1.6"
                   }
                 }
               }
@@ -300,9 +300,9 @@
               "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
               "dev": true,
               "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
               }
             },
             "kind-of": {
@@ -319,14 +319,14 @@
           "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
           "dev": true,
           "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "define-property": {
@@ -335,7 +335,7 @@
               "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
               "dev": true,
               "requires": {
-                "is-descriptor": "^1.0.0"
+                "is-descriptor": "1.0.2"
               }
             },
             "extend-shallow": {
@@ -344,7 +344,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -355,10 +355,10 @@
           "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
           },
           "dependencies": {
             "extend-shallow": {
@@ -367,7 +367,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -378,8 +378,8 @@
           "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
           "dev": true,
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
+            "is-glob": "3.1.0",
+            "path-dirname": "1.0.2"
           },
           "dependencies": {
             "is-glob": {
@@ -388,7 +388,7 @@
               "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
               "dev": true,
               "requires": {
-                "is-extglob": "^2.1.0"
+                "is-extglob": "2.1.1"
               }
             }
           }
@@ -399,7 +399,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -408,7 +408,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -417,9 +417,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         },
         "is-extglob": {
@@ -434,7 +434,7 @@
           "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.1"
+            "is-extglob": "2.1.1"
           }
         },
         "is-number": {
@@ -443,7 +443,7 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -452,7 +452,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -475,19 +475,19 @@
           "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.9",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           }
         }
       }
@@ -499,7 +499,7 @@
       "dev": true,
       "requires": {
         "@angular-devkit/core": "0.6.0",
-        "rxjs": "^6.0.0"
+        "rxjs": "6.1.0"
       }
     },
     "@angular/animations": {
@@ -507,7 +507,7 @@
       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.0.0.tgz",
       "integrity": "sha512-jl3WZmM/csNeyzdb1cEEc5cUX7jLn3NvPYEiP/ZkKmib0XBGIGBBv7xiuoivTJFJsE4/N5sCFEHRFLnuBBE+OA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.0"
       }
     },
     "@angular/cdk": {
@@ -515,7 +515,7 @@
       "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.4.7.tgz",
       "integrity": "sha512-18x0U66fLD5kGQWZ9n3nb75xQouXlWs7kUDaTd8HTrHpT1s2QIAqlLd1KxfrYiVhsEC2jPQaoiae7VnBlcvkBg==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "1.9.0"
       }
     },
     "@angular/cli": {
@@ -529,13 +529,13 @@
         "@angular-devkit/schematics": "0.6.0",
         "@schematics/angular": "0.6.0",
         "@schematics/update": "0.6.0",
-        "opn": "~5.1.0",
-        "resolve": "^1.1.7",
-        "rxjs": "^6.0.0",
-        "semver": "^5.1.0",
-        "silent-error": "^1.0.0",
-        "symbol-observable": "^1.2.0",
-        "yargs-parser": "^10.0.0"
+        "opn": "5.1.0",
+        "resolve": "1.5.0",
+        "rxjs": "6.1.0",
+        "semver": "5.5.0",
+        "silent-error": "1.1.0",
+        "symbol-observable": "1.2.0",
+        "yargs-parser": "10.0.0"
       }
     },
     "@angular/common": {
@@ -543,7 +543,7 @@
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.0.0.tgz",
       "integrity": "sha512-oo/KESihAZo0FsZPHthO9PYhanN4Q+Lo7Lb2HNbWnD+xRIPa1yFC12JOWiD+SPPfFGWMI6aW3wAlcoej1+QKSw==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.0"
       }
     },
     "@angular/compiler": {
@@ -551,7 +551,7 @@
       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.0.0.tgz",
       "integrity": "sha512-UsYfsvHf4VVtkhzM7tyabh8co7gqWZTm3p79hbLDeyCEojl0AkrwbSgh0DQnKRxp4Tu3DEeeDkg1ahA7n19I8A==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.0"
       }
     },
     "@angular/compiler-cli": {
@@ -560,10 +560,10 @@
       "integrity": "sha512-RV0xTSTPT3yOnbS5Gx6lMAETQeTUr72Ifu0+JZh9AV07xGVislZ+SdQGSeNgXoqxise6e65lJp3Nrb5KE4Lv6g==",
       "dev": true,
       "requires": {
-        "chokidar": "^1.4.2",
-        "minimist": "^1.2.0",
-        "reflect-metadata": "^0.1.2",
-        "tsickle": "^0.27.2"
+        "chokidar": "1.7.0",
+        "minimist": "1.2.0",
+        "reflect-metadata": "0.1.12",
+        "tsickle": "0.27.5"
       },
       "dependencies": {
         "minimist": {
@@ -579,7 +579,7 @@
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.0.0.tgz",
       "integrity": "sha512-52X2ZKXOoaMRYaC/ycHePTkXuwku8qJFxoEXAFBItAkk9rebLU4CD8Fx1Z9vUd8aWu1uFfLTxqkgE0mUyBANZw==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.0"
       }
     },
     "@angular/forms": {
@@ -587,7 +587,7 @@
       "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.0.0.tgz",
       "integrity": "sha512-4eVfCcSyPRhml7Xa6ia/DgDl3JhOnEdBdHo+jads1YL5AF6D08Tthngjf3KjuctGqZDACPyxNt6ciX4g8IbGCA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.0"
       }
     },
     "@angular/http": {
@@ -595,7 +595,7 @@
       "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.0.0.tgz",
       "integrity": "sha512-nBZ4KmXx0KR+cIPOMBsJpPhcec5wSCbVtTYRH0zTxmzTmqM3g6+i0PECpqbVgcQEGiOxBLcmXNWfXZl5czpiqw==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.0"
       }
     },
     "@angular/language-service": {
@@ -609,7 +609,7 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.0.0.tgz",
       "integrity": "sha512-ExI1o40BJIbJKFz1p1ivGSgLA1+T0uUo8rjheOZhcGDwCNx54/RapCFLdcHCNiW8NzAIzx+kt4DdXnCSKitnDA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.0"
       }
     },
     "@angular/platform-browser-dynamic": {
@@ -617,7 +617,7 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0.tgz",
       "integrity": "sha512-yk4wZYn2bosuvDaYaEq6UuEeI966/28uCljm5iBfo3l8Vuv2IChk5664M68O6C+KwWzCCWDHvIqm0q178YUYug==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.0"
       }
     },
     "@angular/router": {
@@ -625,7 +625,7 @@
       "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.0.0.tgz",
       "integrity": "sha512-ONrfgfYmFGz0Ht2MvymMvBMxPI9w5037ZfJWpTu1/Xo1XmVOawzj2SvYfEzTqexznWcTAALggq/A23k8r9ArKA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.0"
       }
     },
     "@asymmetrik/ngx-leaflet": {
@@ -639,24 +639,24 @@
       "integrity": "sha512-+hXITPup4tL4Jh3lo52YojXvshjcna95IzFm5FxEBM3vpXK4D+e1y6v7uUsVW2UopXfxv16uXBKm6b3GiaPTaQ==",
       "dev": true,
       "requires": {
-        "@compodoc/ngd-transformer": "^2.0.0-alpha.4",
-        "cheerio": "^1.0.0-rc.2",
-        "chokidar": "^1.7.0",
-        "colors": "^1.1.2",
+        "@compodoc/ngd-transformer": "2.0.0",
+        "cheerio": "1.0.0-rc.2",
+        "chokidar": "1.7.0",
+        "colors": "1.1.2",
         "commander": "2.11.0",
-        "findit": "^2.0.0",
-        "fs-extra": "^4.0.1",
-        "glob": "^7.1.2",
-        "gulp-util": "^3.0.8",
-        "handlebars": "^4.0.10",
-        "html-entities": "^1.2.1",
-        "json5": "^0.5.1",
+        "findit": "2.0.0",
+        "fs-extra": "4.0.3",
+        "glob": "7.1.2",
+        "gulp-util": "3.0.8",
+        "handlebars": "4.0.11",
+        "html-entities": "1.2.1",
+        "json5": "0.5.1",
         "live-server": "1.1.0",
-        "lodash": "^4.17.3",
+        "lodash": "4.17.5",
         "lunr": "1.0.0",
-        "marked": "^0.3.6",
-        "os-name": "^2.0.1",
-        "shelljs": "^0.7.8",
+        "marked": "0.3.16",
+        "os-name": "2.0.1",
+        "shelljs": "0.7.8",
         "typescript": "2.5.2"
       },
       "dependencies": {
@@ -680,9 +680,9 @@
       "integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^1.0.1",
-        "fancy-log": "^1.3.2",
-        "typescript": "^2.4.2"
+        "ansi-colors": "1.1.0",
+        "fancy-log": "1.3.2",
+        "typescript": "2.7.2"
       }
     },
     "@compodoc/ngd-transformer": {
@@ -691,10 +691,10 @@
       "integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
       "dev": true,
       "requires": {
-        "@compodoc/ngd-core": "~2.0.0",
-        "dot": "^1.1.1",
-        "fs-extra": "^4.0.1",
-        "viz.js": "^1.8.0"
+        "@compodoc/ngd-core": "2.0.0",
+        "dot": "1.1.2",
+        "fs-extra": "4.0.3",
+        "viz.js": "1.8.0"
       }
     },
     "@fortawesome/fontawesome-free": {
@@ -738,8 +738,8 @@
       "dev": true,
       "requires": {
         "@angular-devkit/core": "0.6.0",
-        "tree-kill": "^1.0.0",
-        "webpack-sources": "^1.1.0"
+        "tree-kill": "1.2.0",
+        "webpack-sources": "1.1.0"
       }
     },
     "@schematics/angular": {
@@ -750,7 +750,7 @@
       "requires": {
         "@angular-devkit/core": "0.6.0",
         "@angular-devkit/schematics": "0.6.0",
-        "typescript": ">=2.6.2 <2.8"
+        "typescript": "2.7.2"
       }
     },
     "@schematics/update": {
@@ -761,10 +761,10 @@
       "requires": {
         "@angular-devkit/core": "0.6.0",
         "@angular-devkit/schematics": "0.6.0",
-        "npm-registry-client": "^8.5.1",
-        "rxjs": "^6.0.0",
-        "semver": "^5.3.0",
-        "semver-intersect": "^1.1.2"
+        "npm-registry-client": "8.5.1",
+        "rxjs": "6.1.0",
+        "semver": "5.5.0",
+        "semver-intersect": "1.3.1"
       }
     },
     "@swimlane/ngx-charts": {
@@ -772,17 +772,17 @@
       "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-7.0.1.tgz",
       "integrity": "sha512-YZNhRpMjhLpbaJK8iwPDj79Czusw12YNGGnrlbn3iwMhH8e3xkZVfzWhRA9RpfbVKo+S7qMhFTSlOhePQ61Zbg==",
       "requires": {
-        "d3-array": "^1.2.1",
-        "d3-brush": "^1.0.4",
-        "d3-color": "^1.0.3",
-        "d3-force": "^1.1.0",
-        "d3-format": "^1.2.0",
-        "d3-hierarchy": "^1.1.5",
-        "d3-interpolate": "^1.1.5",
-        "d3-scale": "^1.0.6",
-        "d3-selection": "^1.1.0",
-        "d3-shape": "^1.2.0",
-        "d3-time-format": "^2.1.0"
+        "d3-array": "1.2.1",
+        "d3-brush": "1.0.4",
+        "d3-color": "1.0.3",
+        "d3-force": "1.1.0",
+        "d3-format": "1.2.2",
+        "d3-hierarchy": "1.1.5",
+        "d3-interpolate": "1.1.6",
+        "d3-scale": "1.0.7",
+        "d3-selection": "1.3.0",
+        "d3-shape": "1.2.0",
+        "d3-time-format": "2.1.1"
       }
     },
     "@types/d3-color": {
@@ -815,7 +815,7 @@
       "integrity": "sha512-hYDVmQZT5VA2kigd4H4bv7vl/OhlympwREUemqBdOqtrYTo5Ytm12a5W5/nGgGYdanGVxj0x/VhZ7J3hOg/YKg==",
       "dev": true,
       "requires": {
-        "@types/jasmine": "*"
+        "@types/jasmine": "2.5.54"
       }
     },
     "@types/leaflet": {
@@ -824,7 +824,7 @@
       "integrity": "sha512-ancdZhtqOp64/ZXuvKuadFCUmXDhRDGiBSqM6MhARk4kET9UKAdkWY76hn0VlwvknmynMB8wbDMJSGXYRbQFEg==",
       "dev": true,
       "requires": {
-        "@types/geojson": "*"
+        "@types/geojson": "7946.0.1"
       }
     },
     "@types/node": {
@@ -851,8 +851,8 @@
       "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
       "dev": true,
       "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
+        "jsonparse": "1.3.1",
+        "through": "2.3.8"
       }
     },
     "abbrev": {
@@ -867,7 +867,7 @@
       "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.16",
+        "mime-types": "2.1.18",
         "negotiator": "0.6.1"
       }
     },
@@ -883,7 +883,7 @@
       "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
       "dev": true,
       "requires": {
-        "acorn": "^5.0.0"
+        "acorn": "5.5.3"
       }
     },
     "add-stream": {
@@ -910,8 +910,8 @@
       "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
       "dev": true,
       "requires": {
-        "extend": "~3.0.0",
-        "semver": "~5.0.1"
+        "extend": "3.0.1",
+        "semver": "5.0.3"
       },
       "dependencies": {
         "semver": {
@@ -928,9 +928,9 @@
       "integrity": "sha1-l41Zf7wrfQ5aXD3esUmmgvKr+g4=",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^1.0.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.3.0"
+        "fast-deep-equal": "1.1.0",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.3.1"
       }
     },
     "ajv-keywords": {
@@ -945,9 +945,9 @@
       "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
+        "kind-of": "3.2.2",
+        "longest": "1.0.1",
+        "repeat-string": "1.6.1"
       }
     },
     "ambi": {
@@ -956,8 +956,8 @@
       "integrity": "sha1-fI43K+SIkRV+fOoBy2+RQ9H3QiA=",
       "dev": true,
       "requires": {
-        "editions": "^1.1.1",
-        "typechecker": "^4.3.0"
+        "editions": "1.3.4",
+        "typechecker": "4.5.0"
       }
     },
     "amdefine": {
@@ -971,8 +971,8 @@
       "resolved": "https://registry.npmjs.org/angular-tree-component/-/angular-tree-component-7.2.0.tgz",
       "integrity": "sha512-xUQvY18WjA8SqNlhDVPWVK0UyPSv2biCRGVrfRiFXEDJQAevLKiXJkw/awTa2mfH/4cuJhmjZuDGXubpcj6Tvw==",
       "requires": {
-        "lodash": "^4.17.5",
-        "mobx": "^3.6.2",
+        "lodash": "4.17.5",
+        "mobx": "3.6.2",
         "mobx-angular": "2.1.1"
       }
     },
@@ -981,7 +981,7 @@
       "resolved": "https://registry.npmjs.org/angular2-chartjs/-/angular2-chartjs-0.4.1.tgz",
       "integrity": "sha512-BTizn/QVbuFW5fKLxFY4bUDK7O5SMs//JhcViRAgcimwaqQ6Cd5JjcQs9/Gatq+LP6fCzkDyqjQwk0maoDNkpg==",
       "requires": {
-        "chart.js": "^2.3.0"
+        "chart.js": "2.7.1"
       }
     },
     "angular2-toaster": {
@@ -995,7 +995,7 @@
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
       "requires": {
-        "ansi-wrap": "^0.1.0"
+        "ansi-wrap": "0.1.0"
       }
     },
     "ansi-gray": {
@@ -1025,7 +1025,7 @@
       "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
       "dev": true,
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "1.9.1"
       },
       "dependencies": {
         "color-convert": {
@@ -1034,7 +1034,7 @@
           "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
           "dev": true,
           "requires": {
-            "color-name": "^1.1.1"
+            "color-name": "1.1.3"
           }
         }
       }
@@ -1051,8 +1051,8 @@
       "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
       "requires": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
       }
     },
     "apache-crypt": {
@@ -1061,7 +1061,7 @@
       "integrity": "sha1-ggeCozu2pf0nEggvDtOiTjybAhQ=",
       "dev": true,
       "requires": {
-        "unix-crypt-td-js": "^1.0.0"
+        "unix-crypt-td-js": "1.0.0"
       }
     },
     "apache-md5": {
@@ -1082,7 +1082,7 @@
       "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
       "dev": true,
       "requires": {
-        "default-require-extensions": "^1.0.0"
+        "default-require-extensions": "1.0.0"
       }
     },
     "aproba": {
@@ -1097,8 +1097,8 @@
       "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
       "dev": true,
       "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
+        "delegates": "1.0.0",
+        "readable-stream": "2.3.4"
       }
     },
     "argparse": {
@@ -1107,7 +1107,7 @@
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
-        "sprintf-js": "~1.0.2"
+        "sprintf-js": "1.0.3"
       }
     },
     "arr-diff": {
@@ -1116,7 +1116,7 @@
       "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
       "dev": true,
       "requires": {
-        "arr-flatten": "^1.0.1"
+        "arr-flatten": "1.1.0"
       }
     },
     "arr-flatten": {
@@ -1167,8 +1167,8 @@
       "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.7.0"
+        "define-properties": "1.1.2",
+        "es-abstract": "1.10.0"
       }
     },
     "array-map": {
@@ -1195,7 +1195,7 @@
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "array-uniq": "^1.0.1"
+        "array-uniq": "1.0.3"
       }
     },
     "array-uniq": {
@@ -1241,9 +1241,9 @@
       "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "bn.js": "4.11.8",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "assert": {
@@ -1273,7 +1273,7 @@
       "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
       "dev": true,
       "requires": {
-        "lodash": "^4.14.0"
+        "lodash": "4.17.5"
       }
     },
     "async-each": {
@@ -1306,12 +1306,12 @@
       "integrity": "sha512-YqUclCBDXUT9Y7aQ8Xv+ja8yhTZYJoMsOD7WS++gZIJLCpCu+gPcKGDlhk6S3WxhLkTcNVdaMZAWys2nzZCH7g==",
       "dev": true,
       "requires": {
-        "browserslist": "^3.2.6",
-        "caniuse-lite": "^1.0.30000832",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^6.0.22",
-        "postcss-value-parser": "^3.2.3"
+        "browserslist": "3.2.7",
+        "caniuse-lite": "1.0.30000839",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "6.0.22",
+        "postcss-value-parser": "3.3.0"
       }
     },
     "aws-sign2": {
@@ -1332,9 +1332,9 @@
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -1349,11 +1349,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "supports-color": {
@@ -1370,14 +1370,14 @@
       "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
       "dev": true,
       "requires": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.7",
-        "trim-right": "^1.0.1"
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "detect-indent": "4.0.0",
+        "jsesc": "1.3.0",
+        "lodash": "4.17.5",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
       }
     },
     "babel-messages": {
@@ -1386,7 +1386,7 @@
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-runtime": {
@@ -1395,8 +1395,8 @@
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
+        "core-js": "2.5.1",
+        "regenerator-runtime": "0.11.1"
       }
     },
     "babel-template": {
@@ -1405,11 +1405,11 @@
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash": "4.17.5"
       }
     },
     "babel-traverse": {
@@ -1418,15 +1418,15 @@
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
+        "babel-code-frame": "6.26.0",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "debug": "2.6.9",
+        "globals": "9.18.0",
+        "invariant": "2.2.3",
+        "lodash": "4.17.5"
       }
     },
     "babel-types": {
@@ -1435,10 +1435,10 @@
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
+        "babel-runtime": "6.26.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.5",
+        "to-fast-properties": "1.0.3"
       }
     },
     "babylon": {
@@ -1465,13 +1465,13 @@
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
+        "cache-base": "1.0.1",
+        "class-utils": "0.3.6",
+        "component-emitter": "1.2.1",
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "mixin-deep": "1.3.1",
+        "pascalcase": "0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -1480,7 +1480,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "is-accessor-descriptor": {
@@ -1489,7 +1489,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -1498,7 +1498,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -1507,9 +1507,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         },
         "isobject": {
@@ -1566,7 +1566,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "tweetnacl": "^0.14.3"
+        "tweetnacl": "0.14.5"
       }
     },
     "beeper": {
@@ -1608,7 +1608,7 @@
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.0"
+        "inherits": "2.0.3"
       }
     },
     "blocking-proxy": {
@@ -1617,7 +1617,7 @@
       "integrity": "sha1-RikF4Nz76pcPQao3Ij3anAexkSs=",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "1.2.0"
       },
       "dependencies": {
         "minimist": {
@@ -1647,15 +1647,15 @@
       "dev": true,
       "requires": {
         "bytes": "3.0.0",
-        "content-type": "~1.0.4",
+        "content-type": "1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.1",
-        "http-errors": "~1.6.2",
+        "depd": "1.1.2",
+        "http-errors": "1.6.2",
         "iconv-lite": "0.4.19",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.3.0",
         "qs": "6.5.1",
         "raw-body": "2.3.2",
-        "type-is": "~1.6.15"
+        "type-is": "1.6.16"
       },
       "dependencies": {
         "qs": {
@@ -1672,12 +1672,12 @@
       "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
       "dev": true,
       "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
+        "array-flatten": "2.1.1",
+        "deep-equal": "1.0.1",
+        "dns-equal": "1.0.0",
+        "dns-txt": "2.0.2",
+        "multicast-dns": "6.2.3",
+        "multicast-dns-service-types": "1.1.0"
       }
     },
     "boolbase": {
@@ -1692,7 +1692,7 @@
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
       "requires": {
-        "hoek": "2.x.x"
+        "hoek": "2.16.3"
       }
     },
     "bootstrap": {
@@ -1706,7 +1706,7 @@
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
       "requires": {
-        "balanced-match": "^1.0.0",
+        "balanced-match": "1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -1716,9 +1716,9 @@
       "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
       "dev": true,
       "requires": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
+        "expand-range": "1.8.2",
+        "preserve": "0.2.0",
+        "repeat-element": "1.1.2"
       }
     },
     "brorand": {
@@ -1733,12 +1733,12 @@
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "buffer-xor": "1.0.3",
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
       }
     },
     "browserify-cipher": {
@@ -1747,9 +1747,9 @@
       "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "dev": true,
       "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
+        "browserify-aes": "1.2.0",
+        "browserify-des": "1.0.1",
+        "evp_bytestokey": "1.0.3"
       }
     },
     "browserify-des": {
@@ -1758,9 +1758,9 @@
       "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1"
+        "cipher-base": "1.0.4",
+        "des.js": "1.0.0",
+        "inherits": "2.0.3"
       }
     },
     "browserify-rsa": {
@@ -1769,8 +1769,8 @@
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
+        "bn.js": "4.11.8",
+        "randombytes": "2.0.6"
       }
     },
     "browserify-sign": {
@@ -1779,13 +1779,13 @@
       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "elliptic": "6.4.0",
+        "inherits": "2.0.3",
+        "parse-asn1": "5.1.1"
       }
     },
     "browserify-zlib": {
@@ -1794,7 +1794,7 @@
       "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
       "requires": {
-        "pako": "~1.0.5"
+        "pako": "1.0.6"
       }
     },
     "browserslist": {
@@ -1803,8 +1803,8 @@
       "integrity": "sha512-oYVLxFVqpX9uMhOIQBLtZL+CX4uY8ZpWcjNTaxyWl5rO8yA9SSNikFnAfvk8J3P/7z3BZwNmEqFKaJoYltj3MQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000835",
-        "electron-to-chromium": "^1.3.45"
+        "caniuse-lite": "1.0.30000839",
+        "electron-to-chromium": "1.3.45"
       },
       "dependencies": {
         "electron-to-chromium": {
@@ -1821,9 +1821,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "1.3.0",
+        "ieee754": "1.1.11",
+        "isarray": "1.0.0"
       }
     },
     "buffer-from": {
@@ -1874,19 +1874,19 @@
       "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.1",
-        "chownr": "^1.0.1",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.1.11",
-        "lru-cache": "^4.1.1",
-        "mississippi": "^2.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.2",
-        "ssri": "^5.2.4",
-        "unique-filename": "^1.1.0",
-        "y18n": "^4.0.0"
+        "bluebird": "3.5.1",
+        "chownr": "1.0.1",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lru-cache": "4.1.1",
+        "mississippi": "2.0.0",
+        "mkdirp": "0.5.1",
+        "move-concurrently": "1.0.1",
+        "promise-inflight": "1.0.1",
+        "rimraf": "2.6.2",
+        "ssri": "5.3.0",
+        "unique-filename": "1.1.0",
+        "y18n": "4.0.0"
       },
       "dependencies": {
         "rimraf": {
@@ -1895,7 +1895,7 @@
           "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
           "dev": true,
           "requires": {
-            "glob": "^7.0.5"
+            "glob": "7.1.2"
           }
         }
       }
@@ -1906,15 +1906,15 @@
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
+        "collection-visit": "1.0.0",
+        "component-emitter": "1.2.1",
+        "get-value": "2.0.6",
+        "has-value": "1.0.0",
+        "isobject": "3.0.1",
+        "set-value": "2.0.0",
+        "to-object-path": "0.3.0",
+        "union-value": "1.0.0",
+        "unset-value": "1.0.0"
       },
       "dependencies": {
         "isobject": {
@@ -1931,10 +1931,10 @@
       "integrity": "sha512-rsGh4SIYyB9glU+d0OcHwiXHXBoUgDhHZaQ1KAbiXqfz1CDPxtTboh1gPbJ0q2qdO8a9lfcjgC5CJ2Ms32y5bw==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "mkdirp": "^0.5.1",
-        "neo-async": "^2.5.0",
-        "schema-utils": "^0.4.2"
+        "loader-utils": "1.1.0",
+        "mkdirp": "0.5.1",
+        "neo-async": "2.5.1",
+        "schema-utils": "0.4.5"
       }
     },
     "callsite": {
@@ -1949,8 +1949,8 @@
       "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
       "dev": true,
       "requires": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
+        "no-case": "2.3.2",
+        "upper-case": "1.1.3"
       }
     },
     "camelcase": {
@@ -1965,8 +1965,8 @@
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
       }
     },
     "caniuse-db": {
@@ -1994,8 +1994,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
+        "align-text": "0.1.4",
+        "lazy-cache": "1.0.4"
       },
       "dependencies": {
         "lazy-cache": {
@@ -2013,9 +2013,9 @@
       "integrity": "sha512-LvixLAQ4MYhbf7hgL4o5PeK32gJKvVzDRiSNIApDofQvyhl8adgG2lJVXn4+ekQoK7HL9RF8lqxwerpe0x2pCw==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.1.0",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^4.0.0"
+        "ansi-styles": "3.2.0",
+        "escape-string-regexp": "1.0.5",
+        "supports-color": "4.5.0"
       }
     },
     "chart.js": {
@@ -2023,8 +2023,8 @@
       "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.1.tgz",
       "integrity": "sha512-pX1oQAY86MiuyZ2hY593Acbl4MLHKrBBhhmZ1YqSadzQbbsBE2rnd6WISoHjIsdf0WDeC0hbePYCz2ZxkV8L+g==",
       "requires": {
-        "chartjs-color": "~2.2.0",
-        "moment": "~2.18.0"
+        "chartjs-color": "2.2.0",
+        "moment": "2.18.1"
       }
     },
     "chartjs-color": {
@@ -2032,8 +2032,8 @@
       "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.2.0.tgz",
       "integrity": "sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=",
       "requires": {
-        "chartjs-color-string": "^0.5.0",
-        "color-convert": "^0.5.3"
+        "chartjs-color-string": "0.5.0",
+        "color-convert": "0.5.3"
       }
     },
     "chartjs-color-string": {
@@ -2041,7 +2041,7 @@
       "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz",
       "integrity": "sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==",
       "requires": {
-        "color-name": "^1.0.0"
+        "color-name": "1.1.3"
       }
     },
     "cheerio": {
@@ -2050,12 +2050,12 @@
       "integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
       "dev": true,
       "requires": {
-        "css-select": "~1.2.0",
-        "dom-serializer": "~0.1.0",
-        "entities": "~1.1.1",
-        "htmlparser2": "^3.9.1",
-        "lodash": "^4.15.0",
-        "parse5": "^3.0.1"
+        "css-select": "1.2.0",
+        "dom-serializer": "0.1.0",
+        "entities": "1.1.1",
+        "htmlparser2": "3.9.2",
+        "lodash": "4.17.5",
+        "parse5": "3.0.3"
       },
       "dependencies": {
         "domhandler": {
@@ -2064,7 +2064,7 @@
           "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
           "dev": true,
           "requires": {
-            "domelementtype": "1"
+            "domelementtype": "1.3.0"
           }
         },
         "htmlparser2": {
@@ -2073,12 +2073,12 @@
           "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
           "dev": true,
           "requires": {
-            "domelementtype": "^1.3.0",
-            "domhandler": "^2.3.0",
-            "domutils": "^1.5.1",
-            "entities": "^1.1.1",
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.0.2"
+            "domelementtype": "1.3.0",
+            "domhandler": "2.4.1",
+            "domutils": "1.5.1",
+            "entities": "1.1.1",
+            "inherits": "2.0.3",
+            "readable-stream": "2.3.4"
           }
         }
       }
@@ -2089,15 +2089,15 @@
       "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
       "dev": true,
       "requires": {
-        "anymatch": "^1.3.0",
-        "async-each": "^1.0.0",
-        "fsevents": "^1.0.0",
-        "glob-parent": "^2.0.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^2.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0"
+        "anymatch": "1.3.2",
+        "async-each": "1.0.1",
+        "fsevents": "1.2.4",
+        "glob-parent": "2.0.0",
+        "inherits": "2.0.3",
+        "is-binary-path": "1.0.1",
+        "is-glob": "2.0.1",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.1.0"
       }
     },
     "chownr": {
@@ -2124,8 +2124,8 @@
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
       }
     },
     "circular-dependency-plugin": {
@@ -2151,10 +2151,10 @@
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
+        "arr-union": "3.1.0",
+        "define-property": "0.2.5",
+        "isobject": "3.0.1",
+        "static-extend": "0.1.2"
       },
       "dependencies": {
         "define-property": {
@@ -2163,7 +2163,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "isobject": {
@@ -2185,7 +2185,7 @@
       "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=",
       "dev": true,
       "requires": {
-        "source-map": "0.5.x"
+        "source-map": "0.5.7"
       }
     },
     "cliui": {
@@ -2194,9 +2194,9 @@
       "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wrap-ansi": "2.1.0"
       }
     },
     "clone": {
@@ -2211,10 +2211,10 @@
       "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.0",
-        "shallow-clone": "^1.0.0"
+        "for-own": "1.0.0",
+        "is-plain-object": "2.0.4",
+        "kind-of": "6.0.2",
+        "shallow-clone": "1.0.0"
       },
       "dependencies": {
         "for-own": {
@@ -2223,7 +2223,7 @@
           "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
           "dev": true,
           "requires": {
-            "for-in": "^1.0.1"
+            "for-in": "1.0.2"
           }
         },
         "kind-of": {
@@ -2240,8 +2240,8 @@
       "integrity": "sha1-6uCiQT9VwJQvgYwin+/OhF1/Oxw=",
       "dev": true,
       "requires": {
-        "is-regexp": "^1.0.0",
-        "is-supported-regexp-flag": "^1.0.0"
+        "is-regexp": "1.0.0",
+        "is-supported-regexp-flag": "1.0.0"
       }
     },
     "clone-stats": {
@@ -2268,12 +2268,12 @@
       "integrity": "sha512-nYwOr49+IV09e7C4aXkVALRz0+XpHqZiUUcxHuDZH4xP1FBcHINyr3qvVhv5Gfm7XRmoLx32tsIhrQhW/gBcog==",
       "dev": true,
       "requires": {
-        "app-root-path": "^2.0.1",
-        "css-selector-tokenizer": "^0.7.0",
-        "cssauron": "^1.4.0",
-        "semver-dsl": "^1.0.1",
-        "source-map": "^0.5.6",
-        "sprintf-js": "^1.0.3"
+        "app-root-path": "2.0.1",
+        "css-selector-tokenizer": "0.7.0",
+        "cssauron": "1.4.0",
+        "semver-dsl": "1.0.1",
+        "source-map": "0.5.7",
+        "sprintf-js": "1.0.3"
       }
     },
     "coffee-script": {
@@ -2288,8 +2288,8 @@
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
+        "map-visit": "1.0.0",
+        "object-visit": "1.0.1"
       }
     },
     "color-convert": {
@@ -2320,16 +2320,16 @@
       "integrity": "sha512-qYVKTg626qpDg4/eBnPXidEPXn5+krbYqHVfyyEFBWV5z3IF4p44HKY/eE2t1ohlcrlIkDgHmFJMfQ8qMLnSFw==",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.1",
-        "color-diff": "^0.1.3",
-        "log-symbols": "^1.0.2",
-        "object-assign": "^4.0.1",
-        "pipetteur": "^2.0.0",
-        "plur": "^2.0.0",
-        "postcss": "^5.0.4",
-        "postcss-reporter": "^1.2.1",
-        "text-table": "^0.2.0",
-        "yargs": "^1.2.6"
+        "chalk": "1.1.3",
+        "color-diff": "0.1.7",
+        "log-symbols": "1.0.2",
+        "object-assign": "4.1.1",
+        "pipetteur": "2.0.3",
+        "plur": "2.1.2",
+        "postcss": "5.2.18",
+        "postcss-reporter": "1.4.1",
+        "text-table": "0.2.0",
+        "yargs": "1.3.3"
       },
       "dependencies": {
         "ansi-styles": {
@@ -2344,11 +2344,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "has-flag": {
@@ -2363,10 +2363,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
+            "chalk": "1.1.3",
+            "js-base64": "2.4.3",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
           },
           "dependencies": {
             "supports-color": {
@@ -2375,7 +2375,7 @@
               "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
               "dev": true,
               "requires": {
-                "has-flag": "^1.0.0"
+                "has-flag": "1.0.0"
               }
             }
           }
@@ -2386,10 +2386,10 @@
           "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
           "dev": true,
           "requires": {
-            "chalk": "^1.0.0",
-            "lodash": "^4.1.0",
-            "log-symbols": "^1.0.2",
-            "postcss": "^5.0.0"
+            "chalk": "1.1.3",
+            "lodash": "4.17.5",
+            "log-symbols": "1.0.2",
+            "postcss": "5.2.18"
           }
         },
         "supports-color": {
@@ -2418,7 +2418,7 @@
       "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
       "dev": true,
       "requires": {
-        "lodash": "^4.5.0"
+        "lodash": "4.17.5"
       }
     },
     "combined-stream": {
@@ -2427,7 +2427,7 @@
       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "dev": true,
       "requires": {
-        "delayed-stream": "~1.0.0"
+        "delayed-stream": "1.0.0"
       }
     },
     "commander": {
@@ -2448,8 +2448,8 @@
       "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
       "dev": true,
       "requires": {
-        "array-ify": "^1.0.0",
-        "dot-prop": "^3.0.0"
+        "array-ify": "1.0.0",
+        "dot-prop": "3.0.0"
       }
     },
     "component-bind": {
@@ -2476,7 +2476,7 @@
       "integrity": "sha1-DRAgq5JLL9tNYnmHXH1tq6a6p6k=",
       "dev": true,
       "requires": {
-        "mime-db": ">= 1.33.0 < 2"
+        "mime-db": "1.33.0"
       }
     },
     "compression": {
@@ -2485,13 +2485,13 @@
       "integrity": "sha1-qv+81qr4VLROuygDU9WtFlH1mmk=",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
+        "accepts": "1.3.4",
         "bytes": "3.0.0",
-        "compressible": "~2.0.13",
+        "compressible": "2.0.13",
         "debug": "2.6.9",
-        "on-headers": "~1.0.1",
+        "on-headers": "1.0.1",
         "safe-buffer": "5.1.1",
-        "vary": "~1.1.2"
+        "vary": "1.1.2"
       }
     },
     "concat-map": {
@@ -2506,10 +2506,10 @@
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
+        "buffer-from": "1.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.4",
+        "typedarray": "0.0.6"
       }
     },
     "connect": {
@@ -2518,9 +2518,9 @@
       "integrity": "sha1-ohNh0/QJnvdhzabcSpc7seuwo00=",
       "dev": true,
       "requires": {
-        "debug": "~2.2.0",
+        "debug": "2.2.0",
         "finalhandler": "0.4.1",
-        "parseurl": "~1.3.1",
+        "parseurl": "1.3.2",
         "utils-merge": "1.0.0"
       },
       "dependencies": {
@@ -2539,10 +2539,10 @@
           "integrity": "sha1-haF8bFmpRxfSYtYSMNSw6+PUoU0=",
           "dev": true,
           "requires": {
-            "debug": "~2.2.0",
-            "escape-html": "~1.0.3",
-            "on-finished": "~2.3.0",
-            "unpipe": "~1.0.0"
+            "debug": "2.2.0",
+            "escape-html": "1.0.3",
+            "on-finished": "2.3.0",
+            "unpipe": "1.0.0"
           }
         },
         "ms": {
@@ -2571,7 +2571,7 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "^0.1.4"
+        "date-now": "0.1.4"
       }
     },
     "console-control-strings": {
@@ -2604,17 +2604,17 @@
       "integrity": "sha512-FvIFg3UcgkAa8aVxv85IMGd07db3ue1nlJ4wMhcYVQ1XcXqVM1fy/hdhC1iSGotNrZL6qEgb6eOxgIXFAY5exA==",
       "dev": true,
       "requires": {
-        "conventional-changelog-angular": "^1.6.6",
-        "conventional-changelog-atom": "^0.2.4",
-        "conventional-changelog-codemirror": "^0.3.4",
-        "conventional-changelog-core": "^2.0.5",
-        "conventional-changelog-ember": "^0.3.6",
-        "conventional-changelog-eslint": "^1.0.4",
-        "conventional-changelog-express": "^0.3.4",
-        "conventional-changelog-jquery": "^0.1.0",
-        "conventional-changelog-jscs": "^0.1.0",
-        "conventional-changelog-jshint": "^0.3.4",
-        "conventional-changelog-preset-loader": "^1.1.6"
+        "conventional-changelog-angular": "1.6.6",
+        "conventional-changelog-atom": "0.2.4",
+        "conventional-changelog-codemirror": "0.3.4",
+        "conventional-changelog-core": "2.0.5",
+        "conventional-changelog-ember": "0.3.6",
+        "conventional-changelog-eslint": "1.0.4",
+        "conventional-changelog-express": "0.3.4",
+        "conventional-changelog-jquery": "0.1.0",
+        "conventional-changelog-jscs": "0.1.0",
+        "conventional-changelog-jshint": "0.3.4",
+        "conventional-changelog-preset-loader": "1.1.6"
       }
     },
     "conventional-changelog-angular": {
@@ -2623,8 +2623,8 @@
       "integrity": "sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==",
       "dev": true,
       "requires": {
-        "compare-func": "^1.3.1",
-        "q": "^1.5.1"
+        "compare-func": "1.3.2",
+        "q": "1.5.1"
       }
     },
     "conventional-changelog-atom": {
@@ -2633,7 +2633,7 @@
       "integrity": "sha512-4+hmbBwcAwx1XzDZ4aEOxk/ONU0iay10G0u/sld16ksgnRUHN7CxmZollm3FFaptr6VADMq1qxomA+JlpblBlg==",
       "dev": true,
       "requires": {
-        "q": "^1.5.1"
+        "q": "1.5.1"
       }
     },
     "conventional-changelog-cli": {
@@ -2642,11 +2642,11 @@
       "integrity": "sha512-b8B1i01df+Lq5t16L3g8uoEGdzViChIKmIo7TComL4DqqrjrtasRaT+/4OPGcApEgX86JkBqb4KVt85ytQinUw==",
       "dev": true,
       "requires": {
-        "add-stream": "^1.0.0",
-        "conventional-changelog": "^1.1.6",
-        "lodash": "^4.1.0",
-        "meow": "^3.7.0",
-        "tempfile": "^1.1.1"
+        "add-stream": "1.0.0",
+        "conventional-changelog": "1.1.17",
+        "lodash": "4.17.5",
+        "meow": "3.7.0",
+        "tempfile": "1.1.1"
       }
     },
     "conventional-changelog-codemirror": {
@@ -2655,7 +2655,7 @@
       "integrity": "sha512-8M7pGgQVzRU//vG3rFlLYqqBywOLxu9XM0/lc1/1Ll7RuKA79PgK9TDpuPmQDHFnqGS7D1YiZpC3Z0D9AIYExg==",
       "dev": true,
       "requires": {
-        "q": "^1.5.1"
+        "q": "1.5.1"
       }
     },
     "conventional-changelog-core": {
@@ -2664,19 +2664,19 @@
       "integrity": "sha512-lP1s7Z3NyEFcG78bWy7GG7nXsq9OpAJgo2xbyAlVBDweLSL5ghvyEZlkEamnAQpIUVK0CAVhs8nPvCiQuXT/VA==",
       "dev": true,
       "requires": {
-        "conventional-changelog-writer": "^3.0.4",
-        "conventional-commits-parser": "^2.1.5",
-        "dateformat": "^3.0.0",
-        "get-pkg-repo": "^1.0.0",
-        "git-raw-commits": "^1.3.4",
-        "git-remote-origin-url": "^2.0.0",
-        "git-semver-tags": "^1.3.4",
-        "lodash": "^4.2.1",
-        "normalize-package-data": "^2.3.5",
-        "q": "^1.5.1",
-        "read-pkg": "^1.1.0",
-        "read-pkg-up": "^1.0.1",
-        "through2": "^2.0.0"
+        "conventional-changelog-writer": "3.0.4",
+        "conventional-commits-parser": "2.1.5",
+        "dateformat": "3.0.3",
+        "get-pkg-repo": "1.4.0",
+        "git-raw-commits": "1.3.4",
+        "git-remote-origin-url": "2.0.0",
+        "git-semver-tags": "1.3.4",
+        "lodash": "4.17.5",
+        "normalize-package-data": "2.4.0",
+        "q": "1.5.1",
+        "read-pkg": "1.1.0",
+        "read-pkg-up": "1.0.1",
+        "through2": "2.0.3"
       },
       "dependencies": {
         "dateformat": {
@@ -2693,7 +2693,7 @@
       "integrity": "sha512-hBM1xb5IrjNtsjXaGryPF/Wn36cwyjkNeqX/CIDbJv/1kRFBHsWoSPYBiNVEpg8xE5fcK4DbPhGTDN2sVoPeiA==",
       "dev": true,
       "requires": {
-        "q": "^1.5.1"
+        "q": "1.5.1"
       }
     },
     "conventional-changelog-eslint": {
@@ -2702,7 +2702,7 @@
       "integrity": "sha512-93ZGrElD1e/5dIxTWBPGluWup0vRoM9W5e1jajsY/QLd86rLIfkOUC2cL+pgHpHtG3beUsDupm4kbTtiGdw0/w==",
       "dev": true,
       "requires": {
-        "q": "^1.5.1"
+        "q": "1.5.1"
       }
     },
     "conventional-changelog-express": {
@@ -2711,7 +2711,7 @@
       "integrity": "sha512-M+UUb715TXT6l9vyMf4HYvAepnQn0AYTcPi6KHrFsd80E0HErjQnqStBg8i3+Qm7EV9+RyATQEnIhSzHbdQ7+A==",
       "dev": true,
       "requires": {
-        "q": "^1.5.1"
+        "q": "1.5.1"
       }
     },
     "conventional-changelog-jquery": {
@@ -2720,7 +2720,7 @@
       "integrity": "sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=",
       "dev": true,
       "requires": {
-        "q": "^1.4.1"
+        "q": "1.5.1"
       }
     },
     "conventional-changelog-jscs": {
@@ -2729,7 +2729,7 @@
       "integrity": "sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=",
       "dev": true,
       "requires": {
-        "q": "^1.4.1"
+        "q": "1.5.1"
       }
     },
     "conventional-changelog-jshint": {
@@ -2738,8 +2738,8 @@
       "integrity": "sha512-CdrqwDgL56b176FVxHmhuOvnO1dRDQvrMaHyuIVjcFlOXukATz2wVT17g8jQU3LvybVbyXvJRbdD5pboo7/1KQ==",
       "dev": true,
       "requires": {
-        "compare-func": "^1.3.1",
-        "q": "^1.5.1"
+        "compare-func": "1.3.2",
+        "q": "1.5.1"
       }
     },
     "conventional-changelog-preset-loader": {
@@ -2754,16 +2754,16 @@
       "integrity": "sha512-EUf/hWiEj3IOa5Jk8XDzM6oS0WgijlYGkUfLc+mDnLH9RwpZqhYIBwgJHWHzEB4My013wx2FhmUu45P6tQrucw==",
       "dev": true,
       "requires": {
-        "compare-func": "^1.3.1",
-        "conventional-commits-filter": "^1.1.5",
-        "dateformat": "^3.0.0",
-        "handlebars": "^4.0.2",
-        "json-stringify-safe": "^5.0.1",
-        "lodash": "^4.2.1",
-        "meow": "^4.0.0",
-        "semver": "^5.5.0",
-        "split": "^1.0.0",
-        "through2": "^2.0.0"
+        "compare-func": "1.3.2",
+        "conventional-commits-filter": "1.1.5",
+        "dateformat": "3.0.3",
+        "handlebars": "4.0.11",
+        "json-stringify-safe": "5.0.1",
+        "lodash": "4.17.5",
+        "meow": "4.0.0",
+        "semver": "5.5.0",
+        "split": "1.0.1",
+        "through2": "2.0.3"
       },
       "dependencies": {
         "camelcase": {
@@ -2778,9 +2778,9 @@
           "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0",
-            "map-obj": "^2.0.0",
-            "quick-lru": "^1.0.0"
+            "camelcase": "4.1.0",
+            "map-obj": "2.0.0",
+            "quick-lru": "1.1.0"
           }
         },
         "dateformat": {
@@ -2801,10 +2801,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           }
         },
         "map-obj": {
@@ -2819,15 +2819,15 @@
           "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
           "dev": true,
           "requires": {
-            "camelcase-keys": "^4.0.0",
-            "decamelize-keys": "^1.0.0",
-            "loud-rejection": "^1.0.0",
-            "minimist": "^1.1.3",
-            "minimist-options": "^3.0.1",
-            "normalize-package-data": "^2.3.4",
-            "read-pkg-up": "^3.0.0",
-            "redent": "^2.0.0",
-            "trim-newlines": "^2.0.0"
+            "camelcase-keys": "4.2.0",
+            "decamelize-keys": "1.1.0",
+            "loud-rejection": "1.6.0",
+            "minimist": "1.2.0",
+            "minimist-options": "3.0.2",
+            "normalize-package-data": "2.4.0",
+            "read-pkg-up": "3.0.0",
+            "redent": "2.0.0",
+            "trim-newlines": "2.0.0"
           }
         },
         "minimist": {
@@ -2842,8 +2842,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.1"
           }
         },
         "read-pkg": {
@@ -2852,9 +2852,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
           }
         },
         "read-pkg-up": {
@@ -2863,8 +2863,8 @@
           "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
           "dev": true,
           "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^3.0.0"
+            "find-up": "2.1.0",
+            "read-pkg": "3.0.0"
           }
         },
         "redent": {
@@ -2873,8 +2873,8 @@
           "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
           "dev": true,
           "requires": {
-            "indent-string": "^3.0.0",
-            "strip-indent": "^2.0.0"
+            "indent-string": "3.2.0",
+            "strip-indent": "2.0.0"
           }
         },
         "split": {
@@ -2883,7 +2883,7 @@
           "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
           "dev": true,
           "requires": {
-            "through": "2"
+            "through": "2.3.8"
           }
         },
         "strip-bom": {
@@ -2912,8 +2912,8 @@
       "integrity": "sha512-mj3+WLj8UZE72zO9jocZjx8+W4Bwnx/KHoIz1vb4F8XUXj0XSjp8Y3MFkpRyIpsRiCBX+DkDjxGKF/nfeu7BGw==",
       "dev": true,
       "requires": {
-        "is-subset": "^0.1.1",
-        "modify-values": "^1.0.0"
+        "is-subset": "0.1.1",
+        "modify-values": "1.0.0"
       }
     },
     "conventional-commits-parser": {
@@ -2922,13 +2922,13 @@
       "integrity": "sha512-jaAP61py+ISMF3/n3yIiIuY5h6mJlucOqawu5mLB1HaQADLvg/y5UB3pT7HSucZJan34lp7+7ylQPfbKEGmxrA==",
       "dev": true,
       "requires": {
-        "JSONStream": "^1.0.4",
-        "is-text-path": "^1.0.0",
-        "lodash": "^4.2.1",
-        "meow": "^4.0.0",
-        "split2": "^2.0.0",
-        "through2": "^2.0.0",
-        "trim-off-newlines": "^1.0.0"
+        "JSONStream": "1.3.2",
+        "is-text-path": "1.0.1",
+        "lodash": "4.17.5",
+        "meow": "4.0.0",
+        "split2": "2.2.0",
+        "through2": "2.0.3",
+        "trim-off-newlines": "1.0.1"
       },
       "dependencies": {
         "camelcase": {
@@ -2943,9 +2943,9 @@
           "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0",
-            "map-obj": "^2.0.0",
-            "quick-lru": "^1.0.0"
+            "camelcase": "4.1.0",
+            "map-obj": "2.0.0",
+            "quick-lru": "1.1.0"
           }
         },
         "indent-string": {
@@ -2960,10 +2960,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           }
         },
         "map-obj": {
@@ -2978,15 +2978,15 @@
           "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
           "dev": true,
           "requires": {
-            "camelcase-keys": "^4.0.0",
-            "decamelize-keys": "^1.0.0",
-            "loud-rejection": "^1.0.0",
-            "minimist": "^1.1.3",
-            "minimist-options": "^3.0.1",
-            "normalize-package-data": "^2.3.4",
-            "read-pkg-up": "^3.0.0",
-            "redent": "^2.0.0",
-            "trim-newlines": "^2.0.0"
+            "camelcase-keys": "4.2.0",
+            "decamelize-keys": "1.1.0",
+            "loud-rejection": "1.6.0",
+            "minimist": "1.2.0",
+            "minimist-options": "3.0.2",
+            "normalize-package-data": "2.4.0",
+            "read-pkg-up": "3.0.0",
+            "redent": "2.0.0",
+            "trim-newlines": "2.0.0"
           }
         },
         "minimist": {
@@ -3001,8 +3001,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.1"
           }
         },
         "read-pkg": {
@@ -3011,9 +3011,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
           }
         },
         "read-pkg-up": {
@@ -3022,8 +3022,8 @@
           "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
           "dev": true,
           "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^3.0.0"
+            "find-up": "2.1.0",
+            "read-pkg": "3.0.0"
           }
         },
         "redent": {
@@ -3032,8 +3032,8 @@
           "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
           "dev": true,
           "requires": {
-            "indent-string": "^3.0.0",
-            "strip-indent": "^2.0.0"
+            "indent-string": "3.2.0",
+            "strip-indent": "2.0.0"
           }
         },
         "strip-bom": {
@@ -3080,12 +3080,12 @@
       "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
+        "aproba": "1.2.0",
+        "fs-write-stream-atomic": "1.0.10",
+        "iferr": "0.1.5",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.1",
+        "run-queue": "1.0.3"
       }
     },
     "copy-descriptor": {
@@ -3100,14 +3100,14 @@
       "integrity": "sha512-OlTo6DYg0XfTKOF8eLf79wcHm4Ut10xU2cRBRPMW/NA5F9VMjZGTfRHWDIYC3s+1kObGYrBLshXWU1K0hILkNQ==",
       "dev": true,
       "requires": {
-        "cacache": "^10.0.4",
-        "find-cache-dir": "^1.0.0",
-        "globby": "^7.1.1",
-        "is-glob": "^4.0.0",
-        "loader-utils": "^1.1.0",
-        "minimatch": "^3.0.4",
-        "p-limit": "^1.0.0",
-        "serialize-javascript": "^1.4.0"
+        "cacache": "10.0.4",
+        "find-cache-dir": "1.0.0",
+        "globby": "7.1.1",
+        "is-glob": "4.0.0",
+        "loader-utils": "1.1.0",
+        "minimatch": "3.0.4",
+        "p-limit": "1.2.0",
+        "serialize-javascript": "1.5.0"
       },
       "dependencies": {
         "is-extglob": {
@@ -3122,7 +3122,7 @@
           "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.1"
+            "is-extglob": "2.1.1"
           }
         }
       }
@@ -3144,8 +3144,8 @@
       "integrity": "sha1-K9OB8usgECAQXNUOpZ2mMJBpRoY=",
       "dev": true,
       "requires": {
-        "object-assign": "^4",
-        "vary": "^1"
+        "object-assign": "4.1.1",
+        "vary": "1.1.2"
       }
     },
     "cosmiconfig": {
@@ -3154,13 +3154,13 @@
       "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
       "dev": true,
       "requires": {
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.4.3",
-        "minimist": "^1.2.0",
-        "object-assign": "^4.1.0",
-        "os-homedir": "^1.0.1",
-        "parse-json": "^2.2.0",
-        "require-from-string": "^1.1.0"
+        "is-directory": "0.3.1",
+        "js-yaml": "3.10.0",
+        "minimist": "1.2.0",
+        "object-assign": "4.1.1",
+        "os-homedir": "1.0.2",
+        "parse-json": "2.2.0",
+        "require-from-string": "1.2.1"
       },
       "dependencies": {
         "minimist": {
@@ -3177,8 +3177,8 @@
       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
+        "bn.js": "4.11.8",
+        "elliptic": "6.4.0"
       }
     },
     "create-hash": {
@@ -3187,11 +3187,11 @@
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
+        "cipher-base": "1.0.4",
+        "inherits": "2.0.3",
+        "md5.js": "1.3.4",
+        "ripemd160": "2.0.2",
+        "sha.js": "2.4.11"
       }
     },
     "create-hmac": {
@@ -3200,12 +3200,12 @@
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.1",
+        "sha.js": "2.4.11"
       }
     },
     "cross-spawn": {
@@ -3214,8 +3214,8 @@
       "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
       "dev": true,
       "requires": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
+        "lru-cache": "4.1.1",
+        "which": "1.3.0"
       }
     },
     "cryptiles": {
@@ -3224,7 +3224,7 @@
       "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
       "dev": true,
       "requires": {
-        "boom": "2.x.x"
+        "boom": "2.10.1"
       }
     },
     "crypto-browserify": {
@@ -3233,17 +3233,17 @@
       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "dev": true,
       "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
+        "browserify-cipher": "1.0.1",
+        "browserify-sign": "4.0.4",
+        "create-ecdh": "4.0.3",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "diffie-hellman": "5.0.3",
+        "inherits": "2.0.3",
+        "pbkdf2": "3.0.16",
+        "public-encrypt": "4.0.2",
+        "randombytes": "2.0.6",
+        "randomfill": "1.0.4"
       }
     },
     "csextends": {
@@ -3252,7 +3252,7 @@
       "integrity": "sha1-zFPBNJ+vfwrmzfb2xKTZFW08TsE=",
       "dev": true,
       "requires": {
-        "coffee-script": "^1.12.5"
+        "coffee-script": "1.12.7"
       }
     },
     "css-color-names": {
@@ -3273,10 +3273,10 @@
       "integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=",
       "dev": true,
       "requires": {
-        "css-tokenize": "^1.0.1",
+        "css-tokenize": "1.0.1",
         "duplexer2": "0.0.2",
-        "ldjson-stream": "^1.2.1",
-        "through2": "^0.6.3"
+        "ldjson-stream": "1.2.1",
+        "through2": "0.6.5"
       },
       "dependencies": {
         "isarray": {
@@ -3291,10 +3291,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "string_decoder": {
@@ -3309,8 +3309,8 @@
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
           "requires": {
-            "readable-stream": ">=1.0.33-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
+            "readable-stream": "1.0.34",
+            "xtend": "4.0.1"
           }
         }
       }
@@ -3321,10 +3321,10 @@
       "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
       "dev": true,
       "requires": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
+        "boolbase": "1.0.0",
+        "css-what": "2.1.0",
         "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
+        "nth-check": "1.0.1"
       }
     },
     "css-selector-tokenizer": {
@@ -3333,9 +3333,9 @@
       "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
       "dev": true,
       "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.0"
+        "cssesc": "0.1.0",
+        "fastparse": "1.1.1",
+        "regexpu-core": "1.0.0"
       }
     },
     "css-tokenize": {
@@ -3344,8 +3344,8 @@
       "integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^1.0.33"
+        "inherits": "2.0.3",
+        "readable-stream": "1.1.14"
       },
       "dependencies": {
         "isarray": {
@@ -3360,10 +3360,10 @@
           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "string_decoder": {
@@ -3386,7 +3386,7 @@
       "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
       "dev": true,
       "requires": {
-        "through": "X.X.X"
+        "through": "2.3.8"
       }
     },
     "cssesc": {
@@ -3407,7 +3407,7 @@
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
       "requires": {
-        "array-find-index": "^1.0.1"
+        "array-find-index": "1.0.2"
       }
     },
     "custom-event": {
@@ -3428,7 +3428,7 @@
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "^0.10.9"
+        "es5-ext": "0.10.42"
       }
     },
     "d3-array": {
@@ -3441,11 +3441,11 @@
       "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.4.tgz",
       "integrity": "sha1-AMLyOAGfJPbAoZSibUGhUw/+e8Q=",
       "requires": {
-        "d3-dispatch": "1",
-        "d3-drag": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "1",
-        "d3-transition": "1"
+        "d3-dispatch": "1.0.3",
+        "d3-drag": "1.2.1",
+        "d3-interpolate": "1.1.6",
+        "d3-selection": "1.3.0",
+        "d3-transition": "1.1.1"
       }
     },
     "d3-collection": {
@@ -3468,8 +3468,8 @@
       "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.1.tgz",
       "integrity": "sha512-Cg8/K2rTtzxzrb0fmnYOUeZHvwa4PHzwXOLZZPwtEs2SKLLKLXeYwZKBB+DlOxUvFmarOnmt//cU4+3US2lyyQ==",
       "requires": {
-        "d3-dispatch": "1",
-        "d3-selection": "1"
+        "d3-dispatch": "1.0.3",
+        "d3-selection": "1.3.0"
       }
     },
     "d3-ease": {
@@ -3482,10 +3482,10 @@
       "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.1.0.tgz",
       "integrity": "sha512-2HVQz3/VCQs0QeRNZTYb7GxoUCeb6bOzMp/cGcLa87awY9ZsPvXOGeZm0iaGBjXic6I1ysKwMn+g+5jSAdzwcg==",
       "requires": {
-        "d3-collection": "1",
-        "d3-dispatch": "1",
-        "d3-quadtree": "1",
-        "d3-timer": "1"
+        "d3-collection": "1.0.4",
+        "d3-dispatch": "1.0.3",
+        "d3-quadtree": "1.0.3",
+        "d3-timer": "1.0.7"
       }
     },
     "d3-format": {
@@ -3503,7 +3503,7 @@
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.6.tgz",
       "integrity": "sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==",
       "requires": {
-        "d3-color": "1"
+        "d3-color": "1.0.3"
       }
     },
     "d3-path": {
@@ -3521,13 +3521,13 @@
       "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.7.tgz",
       "integrity": "sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==",
       "requires": {
-        "d3-array": "^1.2.0",
-        "d3-collection": "1",
-        "d3-color": "1",
-        "d3-format": "1",
-        "d3-interpolate": "1",
-        "d3-time": "1",
-        "d3-time-format": "2"
+        "d3-array": "1.2.1",
+        "d3-collection": "1.0.4",
+        "d3-color": "1.0.3",
+        "d3-format": "1.2.2",
+        "d3-interpolate": "1.1.6",
+        "d3-time": "1.0.8",
+        "d3-time-format": "2.1.1"
       }
     },
     "d3-selection": {
@@ -3540,7 +3540,7 @@
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.2.0.tgz",
       "integrity": "sha1-RdAVOPBkuv0F6j1tLLdI/YxB93c=",
       "requires": {
-        "d3-path": "1"
+        "d3-path": "1.0.5"
       }
     },
     "d3-time": {
@@ -3553,7 +3553,7 @@
       "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.1.tgz",
       "integrity": "sha512-8kAkymq2WMfzW7e+s/IUNAtN/y3gZXGRrdGfo6R8NKPAA85UBTxZg5E61bR6nLwjPjj4d3zywSQe1CkYLPFyrw==",
       "requires": {
-        "d3-time": "1"
+        "d3-time": "1.0.8"
       }
     },
     "d3-timer": {
@@ -3566,12 +3566,12 @@
       "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.1.1.tgz",
       "integrity": "sha512-xeg8oggyQ+y5eb4J13iDgKIjUcEfIOZs2BqV/eEmXm2twx80wTzJ4tB4vaZ5BKfz7XsI/DFmQL5me6O27/5ykQ==",
       "requires": {
-        "d3-color": "1",
-        "d3-dispatch": "1",
-        "d3-ease": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "^1.1.0",
-        "d3-timer": "1"
+        "d3-color": "1.0.3",
+        "d3-dispatch": "1.0.3",
+        "d3-ease": "1.0.3",
+        "d3-interpolate": "1.1.6",
+        "d3-selection": "1.3.0",
+        "d3-timer": "1.0.7"
       }
     },
     "dargs": {
@@ -3580,7 +3580,7 @@
       "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "dashdash": {
@@ -3589,7 +3589,7 @@
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "1.0.0"
       },
       "dependencies": {
         "assert-plus": {
@@ -3633,8 +3633,8 @@
       "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
       "dev": true,
       "requires": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
+        "decamelize": "1.2.0",
+        "map-obj": "1.0.1"
       }
     },
     "decode-uri-component": {
@@ -3661,7 +3661,7 @@
       "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
       "dev": true,
       "requires": {
-        "strip-bom": "^2.0.0"
+        "strip-bom": "2.0.0"
       }
     },
     "define-properties": {
@@ -3670,8 +3670,8 @@
       "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
       "dev": true,
       "requires": {
-        "foreach": "^2.0.5",
-        "object-keys": "^1.0.8"
+        "foreach": "2.0.5",
+        "object-keys": "1.0.11"
       }
     },
     "define-property": {
@@ -3680,8 +3680,8 @@
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
+        "is-descriptor": "1.0.2",
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "is-accessor-descriptor": {
@@ -3690,7 +3690,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -3699,7 +3699,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -3708,9 +3708,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         },
         "isobject": {
@@ -3733,12 +3733,12 @@
       "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
-        "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
+        "globby": "6.1.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.0",
+        "p-map": "1.2.0",
+        "pify": "3.0.0",
+        "rimraf": "2.6.1"
       },
       "dependencies": {
         "globby": {
@@ -3747,11 +3747,11 @@
           "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           },
           "dependencies": {
             "pify": {
@@ -3788,8 +3788,8 @@
       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "destroy": {
@@ -3804,7 +3804,7 @@
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
       "dev": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "repeating": "2.0.1"
       }
     },
     "detect-node": {
@@ -3831,9 +3831,9 @@
       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
+        "bn.js": "4.11.8",
+        "miller-rabin": "4.0.1",
+        "randombytes": "2.0.6"
       }
     },
     "dir-glob": {
@@ -3842,8 +3842,8 @@
       "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.1",
-        "path-type": "^3.0.0"
+        "arrify": "1.0.1",
+        "path-type": "3.0.0"
       }
     },
     "dns-equal": {
@@ -3858,8 +3858,8 @@
       "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
       "dev": true,
       "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
+        "ip": "1.1.5",
+        "safe-buffer": "5.1.1"
       }
     },
     "dns-txt": {
@@ -3868,7 +3868,7 @@
       "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
       "dev": true,
       "requires": {
-        "buffer-indexof": "^1.0.0"
+        "buffer-indexof": "1.1.1"
       }
     },
     "doiuse": {
@@ -3877,18 +3877,18 @@
       "integrity": "sha1-GJLRC2Gpo1at2/K2FJM+gfi7ODQ=",
       "dev": true,
       "requires": {
-        "browserslist": "^1.1.1",
-        "caniuse-db": "^1.0.30000187",
-        "css-rule-stream": "^1.1.0",
+        "browserslist": "1.7.7",
+        "caniuse-db": "1.0.30000810",
+        "css-rule-stream": "1.1.0",
         "duplexer2": "0.0.2",
-        "jsonfilter": "^1.1.2",
-        "ldjson-stream": "^1.2.1",
-        "lodash": "^4.0.0",
-        "multimatch": "^2.0.0",
-        "postcss": "^5.0.8",
-        "source-map": "^0.4.2",
-        "through2": "^0.6.3",
-        "yargs": "^3.5.4"
+        "jsonfilter": "1.1.2",
+        "ldjson-stream": "1.2.1",
+        "lodash": "4.17.5",
+        "multimatch": "2.1.0",
+        "postcss": "5.2.18",
+        "source-map": "0.4.4",
+        "through2": "0.6.5",
+        "yargs": "3.32.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -3903,8 +3903,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "^1.0.30000639",
-            "electron-to-chromium": "^1.2.7"
+            "caniuse-db": "1.0.30000810",
+            "electron-to-chromium": "1.3.34"
           }
         },
         "chalk": {
@@ -3913,11 +3913,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           },
           "dependencies": {
             "supports-color": {
@@ -3946,10 +3946,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
+            "chalk": "1.1.3",
+            "js-base64": "2.4.3",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
           },
           "dependencies": {
             "source-map": {
@@ -3966,10 +3966,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "source-map": {
@@ -3978,7 +3978,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         },
         "string_decoder": {
@@ -3993,7 +3993,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         },
         "through2": {
@@ -4002,8 +4002,8 @@
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
           "requires": {
-            "readable-stream": ">=1.0.33-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
+            "readable-stream": "1.0.34",
+            "xtend": "4.0.1"
           }
         },
         "window-size": {
@@ -4024,13 +4024,13 @@
           "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
           "dev": true,
           "requires": {
-            "camelcase": "^2.0.1",
-            "cliui": "^3.0.3",
-            "decamelize": "^1.1.1",
-            "os-locale": "^1.4.0",
-            "string-width": "^1.0.1",
-            "window-size": "^0.1.4",
-            "y18n": "^3.2.0"
+            "camelcase": "2.1.1",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "os-locale": "1.4.0",
+            "string-width": "1.0.2",
+            "window-size": "0.1.4",
+            "y18n": "3.2.1"
           }
         }
       }
@@ -4041,7 +4041,7 @@
       "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=",
       "dev": true,
       "requires": {
-        "utila": "~0.3"
+        "utila": "0.3.3"
       },
       "dependencies": {
         "utila": {
@@ -4058,10 +4058,10 @@
       "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
       "dev": true,
       "requires": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
+        "custom-event": "1.0.1",
+        "ent": "2.2.0",
+        "extend": "3.0.1",
+        "void-elements": "2.0.1"
       }
     },
     "dom-serializer": {
@@ -4070,8 +4070,8 @@
       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
       "dev": true,
       "requires": {
-        "domelementtype": "~1.1.1",
-        "entities": "~1.1.1"
+        "domelementtype": "1.1.3",
+        "entities": "1.1.1"
       },
       "dependencies": {
         "domelementtype": {
@@ -4100,7 +4100,7 @@
       "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=",
       "dev": true,
       "requires": {
-        "domelementtype": "1"
+        "domelementtype": "1.3.0"
       }
     },
     "domutils": {
@@ -4109,8 +4109,8 @@
       "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
       "dev": true,
       "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
+        "dom-serializer": "0.1.0",
+        "domelementtype": "1.3.0"
       }
     },
     "dot": {
@@ -4125,7 +4125,7 @@
       "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
       "dev": true,
       "requires": {
-        "is-obj": "^1.0.0"
+        "is-obj": "1.0.1"
       }
     },
     "duplexer": {
@@ -4140,7 +4140,7 @@
       "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
       "dev": true,
       "requires": {
-        "readable-stream": "~1.1.9"
+        "readable-stream": "1.1.14"
       },
       "dependencies": {
         "isarray": {
@@ -4155,10 +4155,10 @@
           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "string_decoder": {
@@ -4175,10 +4175,10 @@
       "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
+        "end-of-stream": "1.4.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.4",
+        "stream-shift": "1.0.0"
       }
     },
     "eachr": {
@@ -4187,8 +4187,8 @@
       "integrity": "sha1-LDXkPqCGUW95l8+At6pk1VpKRIQ=",
       "dev": true,
       "requires": {
-        "editions": "^1.1.1",
-        "typechecker": "^4.3.0"
+        "editions": "1.3.4",
+        "typechecker": "4.5.0"
       }
     },
     "ecc-jsbn": {
@@ -4198,7 +4198,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "jsbn": "~0.1.0"
+        "jsbn": "0.1.1"
       }
     },
     "echarts": {
@@ -4239,13 +4239,13 @@
       "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0",
+        "hash.js": "1.1.3",
+        "hmac-drbg": "1.0.1",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
       }
     },
     "emojis-list": {
@@ -4266,7 +4266,7 @@
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
-        "once": "^1.4.0"
+        "once": "1.4.0"
       }
     },
     "engine.io": {
@@ -4289,7 +4289,7 @@
           "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
           "dev": true,
           "requires": {
-            "mime-types": "~2.1.11",
+            "mime-types": "2.1.18",
             "negotiator": "0.6.1"
           }
         },
@@ -4367,9 +4367,9 @@
       "integrity": "sha512-jox/62b2GofV1qTUQTMPEJSDIGycS43evqYzD/KVtEb9OCoki9cnacUPxCrZa7JfPzZSYOCZhu9O9luaMxAX8g==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
-        "tapable": "^1.0.0"
+        "graceful-fs": "4.1.11",
+        "memory-fs": "0.4.1",
+        "tapable": "1.0.0"
       }
     },
     "ent": {
@@ -4390,7 +4390,7 @@
       "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "requires": {
-        "prr": "~1.0.1"
+        "prr": "1.0.1"
       }
     },
     "error-ex": {
@@ -4399,7 +4399,7 @@
       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
       "dev": true,
       "requires": {
-        "is-arrayish": "^0.2.1"
+        "is-arrayish": "0.2.1"
       }
     },
     "es-abstract": {
@@ -4408,11 +4408,11 @@
       "integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "^1.1.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
+        "es-to-primitive": "1.1.1",
+        "function-bind": "1.1.1",
+        "has": "1.0.1",
+        "is-callable": "1.1.3",
+        "is-regex": "1.0.4"
       }
     },
     "es-to-primitive": {
@@ -4421,9 +4421,9 @@
       "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
       "dev": true,
       "requires": {
-        "is-callable": "^1.1.1",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.1"
+        "is-callable": "1.1.3",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.1"
       }
     },
     "es5-ext": {
@@ -4432,9 +4432,9 @@
       "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==",
       "dev": true,
       "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.1",
-        "next-tick": "1"
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1",
+        "next-tick": "1.0.0"
       }
     },
     "es6-iterator": {
@@ -4443,9 +4443,9 @@
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
+        "d": "1.0.0",
+        "es5-ext": "0.10.42",
+        "es6-symbol": "3.1.1"
       }
     },
     "es6-symbol": {
@@ -4454,8 +4454,8 @@
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
+        "d": "1.0.0",
+        "es5-ext": "0.10.42"
       }
     },
     "escape-html": {
@@ -4476,11 +4476,11 @@
       "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
       "dev": true,
       "requires": {
-        "esprima": "^2.7.1",
-        "estraverse": "^1.9.1",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.2.0"
+        "esprima": "2.7.3",
+        "estraverse": "1.9.3",
+        "esutils": "2.0.2",
+        "optionator": "0.8.2",
+        "source-map": "0.2.0"
       },
       "dependencies": {
         "esprima": {
@@ -4496,7 +4496,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -4507,8 +4507,8 @@
       "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
       "dev": true,
       "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
+        "esrecurse": "4.2.1",
+        "estraverse": "4.2.0"
       },
       "dependencies": {
         "estraverse": {
@@ -4531,7 +4531,7 @@
       "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "4.2.0"
       },
       "dependencies": {
         "estraverse": {
@@ -4566,13 +4566,13 @@
       "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
       "dev": true,
       "requires": {
-        "duplexer": "~0.1.1",
-        "from": "~0",
-        "map-stream": "~0.1.0",
+        "duplexer": "0.1.1",
+        "from": "0.1.7",
+        "map-stream": "0.1.0",
         "pause-stream": "0.0.11",
-        "split": "0.3",
-        "stream-combiner": "~0.0.4",
-        "through": "~2.3.1"
+        "split": "0.3.3",
+        "stream-combiner": "0.0.4",
+        "through": "2.3.8"
       }
     },
     "eventemitter3": {
@@ -4593,7 +4593,7 @@
       "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
       "dev": true,
       "requires": {
-        "original": ">=0.0.5"
+        "original": "1.0.0"
       }
     },
     "evp_bytestokey": {
@@ -4602,8 +4602,8 @@
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
+        "md5.js": "1.3.4",
+        "safe-buffer": "5.1.1"
       }
     },
     "execa": {
@@ -4612,13 +4612,13 @@
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "dev": true,
       "requires": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
+        "cross-spawn": "5.1.0",
+        "get-stream": "3.0.0",
+        "is-stream": "1.1.0",
+        "npm-run-path": "2.0.2",
+        "p-finally": "1.0.0",
+        "signal-exit": "3.0.2",
+        "strip-eof": "1.0.0"
       },
       "dependencies": {
         "cross-spawn": {
@@ -4627,9 +4627,9 @@
           "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
           "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "lru-cache": "4.1.1",
+            "shebang-command": "1.2.0",
+            "which": "1.3.0"
           }
         }
       }
@@ -4640,7 +4640,7 @@
       "integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=",
       "dev": true,
       "requires": {
-        "clone-regexp": "^1.0.0"
+        "clone-regexp": "1.0.0"
       }
     },
     "exit": {
@@ -4655,9 +4655,9 @@
       "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
       "dev": true,
       "requires": {
-        "array-slice": "^0.2.3",
-        "array-unique": "^0.2.1",
-        "braces": "^0.1.2"
+        "array-slice": "0.2.3",
+        "array-unique": "0.2.1",
+        "braces": "0.1.5"
       },
       "dependencies": {
         "braces": {
@@ -4666,7 +4666,7 @@
           "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
           "dev": true,
           "requires": {
-            "expand-range": "^0.1.0"
+            "expand-range": "0.1.1"
           }
         },
         "expand-range": {
@@ -4675,8 +4675,8 @@
           "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
           "dev": true,
           "requires": {
-            "is-number": "^0.1.1",
-            "repeat-string": "^0.2.2"
+            "is-number": "0.1.1",
+            "repeat-string": "0.2.2"
           }
         },
         "is-number": {
@@ -4699,7 +4699,7 @@
       "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
       "dev": true,
       "requires": {
-        "is-posix-bracket": "^0.1.0"
+        "is-posix-bracket": "0.1.1"
       }
     },
     "expand-range": {
@@ -4708,7 +4708,7 @@
       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
       "dev": true,
       "requires": {
-        "fill-range": "^2.1.0"
+        "fill-range": "2.2.3"
       }
     },
     "express": {
@@ -4717,36 +4717,36 @@
       "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.5",
+        "accepts": "1.3.5",
         "array-flatten": "1.1.1",
         "body-parser": "1.18.2",
         "content-disposition": "0.5.2",
-        "content-type": "~1.0.4",
+        "content-type": "1.0.4",
         "cookie": "0.3.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
+        "depd": "1.1.2",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
         "finalhandler": "1.1.1",
         "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
+        "methods": "1.1.2",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.3",
+        "proxy-addr": "2.0.3",
         "qs": "6.5.1",
-        "range-parser": "~1.2.0",
+        "range-parser": "1.2.0",
         "safe-buffer": "5.1.1",
         "send": "0.16.2",
         "serve-static": "1.13.2",
         "setprototypeof": "1.1.0",
-        "statuses": "~1.4.0",
-        "type-is": "~1.6.16",
+        "statuses": "1.4.0",
+        "type-is": "1.6.16",
         "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
+        "vary": "1.1.2"
       },
       "dependencies": {
         "accepts": {
@@ -4755,7 +4755,7 @@
           "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
           "dev": true,
           "requires": {
-            "mime-types": "~2.1.18",
+            "mime-types": "2.1.18",
             "negotiator": "0.6.1"
           }
         },
@@ -4772,12 +4772,12 @@
           "dev": true,
           "requires": {
             "debug": "2.6.9",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "on-finished": "~2.3.0",
-            "parseurl": "~1.3.2",
-            "statuses": "~1.4.0",
-            "unpipe": "~1.0.0"
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "on-finished": "2.3.0",
+            "parseurl": "1.3.2",
+            "statuses": "1.4.0",
+            "unpipe": "1.0.0"
           }
         },
         "qs": {
@@ -4806,8 +4806,8 @@
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "assign-symbols": "1.0.0",
+        "is-extendable": "1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -4816,7 +4816,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         }
       }
@@ -4827,8 +4827,8 @@
       "integrity": "sha512-BmBSu+KOX2XOo3XMECiekGY8VAr3O4aGYgOaHQDNg2ez5rOYW+SDfNStao4VNzr+6N27Vw3A7HJKJMrHmAAXvQ==",
       "dev": true,
       "requires": {
-        "editions": "^1.3.3",
-        "typechecker": "^4.4.1"
+        "editions": "1.3.4",
+        "typechecker": "4.5.0"
       }
     },
     "extglob": {
@@ -4837,7 +4837,7 @@
       "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
       "dev": true,
       "requires": {
-        "is-extglob": "^1.0.0"
+        "is-extglob": "1.0.0"
       }
     },
     "extract-opts": {
@@ -4846,9 +4846,9 @@
       "integrity": "sha1-WrvtyYwNUgLjJ4cn+Rktfghsa+E=",
       "dev": true,
       "requires": {
-        "eachr": "^3.2.0",
-        "editions": "^1.1.1",
-        "typechecker": "^4.3.0"
+        "eachr": "3.2.0",
+        "editions": "1.3.4",
+        "typechecker": "4.5.0"
       }
     },
     "extsprintf": {
@@ -4863,9 +4863,9 @@
       "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=",
       "dev": true,
       "requires": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "time-stamp": "^1.0.0"
+        "ansi-gray": "0.1.1",
+        "color-support": "1.1.3",
+        "time-stamp": "1.1.0"
       },
       "dependencies": {
         "time-stamp": {
@@ -4906,7 +4906,7 @@
       "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "dev": true,
       "requires": {
-        "websocket-driver": ">=0.5.1"
+        "websocket-driver": "0.7.0"
       }
     },
     "file-entry-cache": {
@@ -4915,8 +4915,8 @@
       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
       "dev": true,
       "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
+        "flat-cache": "1.3.0",
+        "object-assign": "4.1.1"
       }
     },
     "file-loader": {
@@ -4925,8 +4925,8 @@
       "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2",
-        "schema-utils": "^0.4.5"
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.4.5"
       }
     },
     "filename-regex": {
@@ -4941,8 +4941,8 @@
       "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.3",
-        "minimatch": "^3.0.3"
+        "glob": "7.1.2",
+        "minimatch": "3.0.4"
       }
     },
     "fill-range": {
@@ -4951,11 +4951,11 @@
       "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
       "dev": true,
       "requires": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^1.1.3",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
+        "is-number": "2.1.0",
+        "isobject": "2.1.0",
+        "randomatic": "1.1.7",
+        "repeat-element": "1.1.2",
+        "repeat-string": "1.6.1"
       }
     },
     "finalhandler": {
@@ -4965,12 +4965,12 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.1",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "statuses": "~1.3.1",
-        "unpipe": "~1.0.0"
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "statuses": "1.3.1",
+        "unpipe": "1.0.0"
       }
     },
     "find-cache-dir": {
@@ -4979,9 +4979,9 @@
       "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
       "dev": true,
       "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^1.0.0",
-        "pkg-dir": "^2.0.0"
+        "commondir": "1.0.1",
+        "make-dir": "1.3.0",
+        "pkg-dir": "2.0.0"
       }
     },
     "find-parent-dir": {
@@ -4996,7 +4996,7 @@
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "dev": true,
       "requires": {
-        "locate-path": "^2.0.0"
+        "locate-path": "2.0.0"
       }
     },
     "findit": {
@@ -5011,10 +5011,10 @@
       "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
       "dev": true,
       "requires": {
-        "circular-json": "^0.3.1",
-        "del": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "write": "^0.2.1"
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
       },
       "dependencies": {
         "del": {
@@ -5023,13 +5023,13 @@
           "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
           "dev": true,
           "requires": {
-            "globby": "^5.0.0",
-            "is-path-cwd": "^1.0.0",
-            "is-path-in-cwd": "^1.0.0",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "rimraf": "^2.2.8"
+            "globby": "5.0.0",
+            "is-path-cwd": "1.0.0",
+            "is-path-in-cwd": "1.0.0",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1",
+            "rimraf": "2.6.1"
           }
         },
         "globby": {
@@ -5038,12 +5038,12 @@
           "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "arrify": "^1.0.0",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "array-union": "1.0.2",
+            "arrify": "1.0.1",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "pify": {
@@ -5066,8 +5066,8 @@
       "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.4"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.4"
       }
     },
     "for-in": {
@@ -5082,7 +5082,7 @@
       "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.1"
+        "for-in": "1.0.2"
       }
     },
     "foreach": {
@@ -5103,9 +5103,9 @@
       "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
       "dev": true,
       "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.5",
-        "mime-types": "^2.1.12"
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "2.1.18"
       }
     },
     "forwarded": {
@@ -5120,7 +5120,7 @@
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "requires": {
-        "map-cache": "^0.2.2"
+        "map-cache": "0.2.2"
       }
     },
     "fresh": {
@@ -5141,8 +5141,8 @@
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.4"
       }
     },
     "fs-access": {
@@ -5151,7 +5151,7 @@
       "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
       "dev": true,
       "requires": {
-        "null-check": "^1.0.0"
+        "null-check": "1.0.0"
       }
     },
     "fs-extra": {
@@ -5160,9 +5160,9 @@
       "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "graceful-fs": "4.1.11",
+        "jsonfile": "4.0.0",
+        "universalify": "0.1.1"
       }
     },
     "fs-write-stream-atomic": {
@@ -5171,10 +5171,10 @@
       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
+        "graceful-fs": "4.1.11",
+        "iferr": "0.1.5",
+        "imurmurhash": "0.1.4",
+        "readable-stream": "2.3.4"
       }
     },
     "fs.realpath": {
@@ -5190,8 +5190,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "^2.9.2",
-        "node-pre-gyp": "^0.10.0"
+        "nan": "2.10.0",
+        "node-pre-gyp": "0.10.0"
       },
       "dependencies": {
         "abbrev": {
@@ -5217,8 +5217,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
+            "delegates": "1.0.0",
+            "readable-stream": "2.3.6"
           }
         },
         "balanced-match": {
@@ -5231,7 +5231,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "balanced-match": "^1.0.0",
+            "balanced-match": "1.0.0",
             "concat-map": "0.0.1"
           }
         },
@@ -5295,7 +5295,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "2.2.4"
           }
         },
         "fs.realpath": {
@@ -5310,14 +5310,14 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
+            "aproba": "1.2.0",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
           }
         },
         "glob": {
@@ -5326,12 +5326,12 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "has-unicode": {
@@ -5346,7 +5346,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safer-buffer": "^2.1.0"
+            "safer-buffer": "2.1.2"
           }
         },
         "ignore-walk": {
@@ -5355,7 +5355,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minimatch": "^3.0.4"
+            "minimatch": "3.0.4"
           }
         },
         "inflight": {
@@ -5364,8 +5364,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
           }
         },
         "inherits": {
@@ -5384,7 +5384,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "isarray": {
@@ -5398,7 +5398,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "brace-expansion": "^1.1.7"
+            "brace-expansion": "1.1.11"
           }
         },
         "minimist": {
@@ -5411,8 +5411,8 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "safe-buffer": "^5.1.1",
-            "yallist": "^3.0.0"
+            "safe-buffer": "5.1.1",
+            "yallist": "3.0.2"
           }
         },
         "minizlib": {
@@ -5421,7 +5421,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "2.2.4"
           }
         },
         "mkdirp": {
@@ -5444,9 +5444,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "^2.1.2",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
+            "debug": "2.6.9",
+            "iconv-lite": "0.4.21",
+            "sax": "1.2.4"
           }
         },
         "node-pre-gyp": {
@@ -5455,16 +5455,16 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.0",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.1.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4"
+            "detect-libc": "1.0.3",
+            "mkdirp": "0.5.1",
+            "needle": "2.2.0",
+            "nopt": "4.0.1",
+            "npm-packlist": "1.1.10",
+            "npmlog": "4.1.2",
+            "rc": "1.2.7",
+            "rimraf": "2.6.2",
+            "semver": "5.5.0",
+            "tar": "4.4.1"
           }
         },
         "nopt": {
@@ -5473,8 +5473,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
+            "abbrev": "1.1.1",
+            "osenv": "0.1.5"
           }
         },
         "npm-bundled": {
@@ -5489,8 +5489,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
+            "ignore-walk": "3.0.1",
+            "npm-bundled": "1.0.3"
           }
         },
         "npmlog": {
@@ -5499,10 +5499,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
           }
         },
         "number-is-nan": {
@@ -5521,7 +5521,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "wrappy": "1"
+            "wrappy": "1.0.2"
           }
         },
         "os-homedir": {
@@ -5542,8 +5542,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
           }
         },
         "path-is-absolute": {
@@ -5564,10 +5564,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "^0.5.1",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
+            "deep-extend": "0.5.1",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
           },
           "dependencies": {
             "minimist": {
@@ -5584,13 +5584,13 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "rimraf": {
@@ -5599,7 +5599,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "glob": "^7.0.5"
+            "glob": "7.1.2"
           }
         },
         "safe-buffer": {
@@ -5642,9 +5642,9 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "string_decoder": {
@@ -5653,7 +5653,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "strip-ansi": {
@@ -5661,7 +5661,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "strip-json-comments": {
@@ -5676,13 +5676,13 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "chownr": "^1.0.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.2.4",
-            "minizlib": "^1.1.0",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.1",
-            "yallist": "^3.0.2"
+            "chownr": "1.0.1",
+            "fs-minipass": "1.2.5",
+            "minipass": "2.2.4",
+            "minizlib": "1.1.0",
+            "mkdirp": "0.5.1",
+            "safe-buffer": "5.1.1",
+            "yallist": "3.0.2"
           }
         },
         "util-deprecate": {
@@ -5697,7 +5697,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "^1.0.2"
+            "string-width": "1.0.2"
           }
         },
         "wrappy": {
@@ -5718,10 +5718,10 @@
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.1"
       }
     },
     "function-bind": {
@@ -5742,14 +5742,14 @@
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
+        "aproba": "1.2.0",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.2"
       }
     },
     "gaze": {
@@ -5758,7 +5758,7 @@
       "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
       "dev": true,
       "requires": {
-        "globule": "^1.0.0"
+        "globule": "1.2.0"
       }
     },
     "generate-function": {
@@ -5773,7 +5773,7 @@
       "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
       "dev": true,
       "requires": {
-        "is-property": "^1.0.0"
+        "is-property": "1.0.2"
       }
     },
     "get-caller-file": {
@@ -5788,11 +5788,11 @@
       "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^2.1.4",
-        "meow": "^3.3.0",
-        "normalize-package-data": "^2.3.0",
-        "parse-github-repo-url": "^1.3.0",
-        "through2": "^2.0.0"
+        "hosted-git-info": "2.5.0",
+        "meow": "3.7.0",
+        "normalize-package-data": "2.4.0",
+        "parse-github-repo-url": "1.4.1",
+        "through2": "2.0.3"
       }
     },
     "get-stdin": {
@@ -5819,7 +5819,7 @@
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "1.0.0"
       },
       "dependencies": {
         "assert-plus": {
@@ -5836,11 +5836,11 @@
       "integrity": "sha512-G3O+41xHbscpgL5nA0DUkbFVgaAz5rd57AMSIMew8p7C8SyFwZDyn08MoXHkTl9zcD0LmxsLFPxbqFY4YPbpPA==",
       "dev": true,
       "requires": {
-        "dargs": "^4.0.1",
-        "lodash.template": "^4.0.2",
-        "meow": "^4.0.0",
-        "split2": "^2.0.0",
-        "through2": "^2.0.0"
+        "dargs": "4.1.0",
+        "lodash.template": "4.4.0",
+        "meow": "4.0.0",
+        "split2": "2.2.0",
+        "through2": "2.0.3"
       },
       "dependencies": {
         "camelcase": {
@@ -5855,9 +5855,9 @@
           "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0",
-            "map-obj": "^2.0.0",
-            "quick-lru": "^1.0.0"
+            "camelcase": "4.1.0",
+            "map-obj": "2.0.0",
+            "quick-lru": "1.1.0"
           }
         },
         "indent-string": {
@@ -5872,10 +5872,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           }
         },
         "lodash.template": {
@@ -5884,8 +5884,8 @@
           "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
           "dev": true,
           "requires": {
-            "lodash._reinterpolate": "~3.0.0",
-            "lodash.templatesettings": "^4.0.0"
+            "lodash._reinterpolate": "3.0.0",
+            "lodash.templatesettings": "4.1.0"
           }
         },
         "lodash.templatesettings": {
@@ -5894,7 +5894,7 @@
           "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
           "dev": true,
           "requires": {
-            "lodash._reinterpolate": "~3.0.0"
+            "lodash._reinterpolate": "3.0.0"
           }
         },
         "map-obj": {
@@ -5909,15 +5909,15 @@
           "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
           "dev": true,
           "requires": {
-            "camelcase-keys": "^4.0.0",
-            "decamelize-keys": "^1.0.0",
-            "loud-rejection": "^1.0.0",
-            "minimist": "^1.1.3",
-            "minimist-options": "^3.0.1",
-            "normalize-package-data": "^2.3.4",
-            "read-pkg-up": "^3.0.0",
-            "redent": "^2.0.0",
-            "trim-newlines": "^2.0.0"
+            "camelcase-keys": "4.2.0",
+            "decamelize-keys": "1.1.0",
+            "loud-rejection": "1.6.0",
+            "minimist": "1.2.0",
+            "minimist-options": "3.0.2",
+            "normalize-package-data": "2.4.0",
+            "read-pkg-up": "3.0.0",
+            "redent": "2.0.0",
+            "trim-newlines": "2.0.0"
           }
         },
         "minimist": {
@@ -5932,8 +5932,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.1"
           }
         },
         "read-pkg": {
@@ -5942,9 +5942,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
           }
         },
         "read-pkg-up": {
@@ -5953,8 +5953,8 @@
           "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
           "dev": true,
           "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^3.0.0"
+            "find-up": "2.1.0",
+            "read-pkg": "3.0.0"
           }
         },
         "redent": {
@@ -5963,8 +5963,8 @@
           "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
           "dev": true,
           "requires": {
-            "indent-string": "^3.0.0",
-            "strip-indent": "^2.0.0"
+            "indent-string": "3.2.0",
+            "strip-indent": "2.0.0"
           }
         },
         "strip-bom": {
@@ -5993,8 +5993,8 @@
       "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
       "dev": true,
       "requires": {
-        "gitconfiglocal": "^1.0.0",
-        "pify": "^2.3.0"
+        "gitconfiglocal": "1.0.0",
+        "pify": "2.3.0"
       },
       "dependencies": {
         "pify": {
@@ -6011,8 +6011,8 @@
       "integrity": "sha512-Xe2Z74MwXZfAezuaO6e6cA4nsgeCiARPzaBp23gma325c/OXdt//PhrknptIaynNeUp2yWtmikV7k5RIicgGIQ==",
       "dev": true,
       "requires": {
-        "meow": "^4.0.0",
-        "semver": "^5.5.0"
+        "meow": "4.0.0",
+        "semver": "5.5.0"
       },
       "dependencies": {
         "camelcase": {
@@ -6027,9 +6027,9 @@
           "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0",
-            "map-obj": "^2.0.0",
-            "quick-lru": "^1.0.0"
+            "camelcase": "4.1.0",
+            "map-obj": "2.0.0",
+            "quick-lru": "1.1.0"
           }
         },
         "indent-string": {
@@ -6044,10 +6044,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           }
         },
         "map-obj": {
@@ -6062,15 +6062,15 @@
           "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
           "dev": true,
           "requires": {
-            "camelcase-keys": "^4.0.0",
-            "decamelize-keys": "^1.0.0",
-            "loud-rejection": "^1.0.0",
-            "minimist": "^1.1.3",
-            "minimist-options": "^3.0.1",
-            "normalize-package-data": "^2.3.4",
-            "read-pkg-up": "^3.0.0",
-            "redent": "^2.0.0",
-            "trim-newlines": "^2.0.0"
+            "camelcase-keys": "4.2.0",
+            "decamelize-keys": "1.1.0",
+            "loud-rejection": "1.6.0",
+            "minimist": "1.2.0",
+            "minimist-options": "3.0.2",
+            "normalize-package-data": "2.4.0",
+            "read-pkg-up": "3.0.0",
+            "redent": "2.0.0",
+            "trim-newlines": "2.0.0"
           }
         },
         "minimist": {
@@ -6085,8 +6085,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.1"
           }
         },
         "read-pkg": {
@@ -6095,9 +6095,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
           }
         },
         "read-pkg-up": {
@@ -6106,8 +6106,8 @@
           "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
           "dev": true,
           "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^3.0.0"
+            "find-up": "2.1.0",
+            "read-pkg": "3.0.0"
           }
         },
         "redent": {
@@ -6116,8 +6116,8 @@
           "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
           "dev": true,
           "requires": {
-            "indent-string": "^3.0.0",
-            "strip-indent": "^2.0.0"
+            "indent-string": "3.2.0",
+            "strip-indent": "2.0.0"
           }
         },
         "strip-bom": {
@@ -6146,7 +6146,7 @@
       "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
       "dev": true,
       "requires": {
-        "ini": "^1.3.2"
+        "ini": "1.3.5"
       }
     },
     "glob": {
@@ -6155,12 +6155,12 @@
       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "dev": true,
       "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
       }
     },
     "glob-base": {
@@ -6169,8 +6169,8 @@
       "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
       "dev": true,
       "requires": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
       }
     },
     "glob-parent": {
@@ -6179,7 +6179,7 @@
       "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
       "dev": true,
       "requires": {
-        "is-glob": "^2.0.0"
+        "is-glob": "2.0.1"
       }
     },
     "globals": {
@@ -6194,12 +6194,12 @@
       "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
       "dev": true,
       "requires": {
-        "array-union": "^1.0.1",
-        "dir-glob": "^2.0.0",
-        "glob": "^7.1.2",
-        "ignore": "^3.3.5",
-        "pify": "^3.0.0",
-        "slash": "^1.0.0"
+        "array-union": "1.0.2",
+        "dir-glob": "2.0.0",
+        "glob": "7.1.2",
+        "ignore": "3.3.7",
+        "pify": "3.0.0",
+        "slash": "1.0.0"
       }
     },
     "globjoin": {
@@ -6214,9 +6214,9 @@
       "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
       "dev": true,
       "requires": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.4",
-        "minimatch": "~3.0.2"
+        "glob": "7.1.2",
+        "lodash": "4.17.5",
+        "minimatch": "3.0.4"
       }
     },
     "glogg": {
@@ -6225,7 +6225,7 @@
       "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==",
       "dev": true,
       "requires": {
-        "sparkles": "^1.0.0"
+        "sparkles": "1.0.0"
       }
     },
     "graceful-fs": {
@@ -6240,24 +6240,24 @@
       "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
       "dev": true,
       "requires": {
-        "array-differ": "^1.0.0",
-        "array-uniq": "^1.0.2",
-        "beeper": "^1.0.0",
-        "chalk": "^1.0.0",
-        "dateformat": "^2.0.0",
-        "fancy-log": "^1.1.0",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "lodash._reescape": "^3.0.0",
-        "lodash._reevaluate": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.0.0",
-        "minimist": "^1.1.0",
-        "multipipe": "^0.1.2",
-        "object-assign": "^3.0.0",
+        "array-differ": "1.0.0",
+        "array-uniq": "1.0.3",
+        "beeper": "1.1.1",
+        "chalk": "1.1.3",
+        "dateformat": "2.2.0",
+        "fancy-log": "1.3.2",
+        "gulplog": "1.0.0",
+        "has-gulplog": "0.1.0",
+        "lodash._reescape": "3.0.0",
+        "lodash._reevaluate": "3.0.0",
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.template": "3.6.2",
+        "minimist": "1.2.0",
+        "multipipe": "0.1.2",
+        "object-assign": "3.0.0",
         "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl": "^0.5.0"
+        "through2": "2.0.3",
+        "vinyl": "0.5.3"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6272,11 +6272,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "minimist": {
@@ -6305,7 +6305,7 @@
       "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
       "dev": true,
       "requires": {
-        "glogg": "^1.0.0"
+        "glogg": "1.0.1"
       }
     },
     "handle-thing": {
@@ -6320,10 +6320,10 @@
       "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
       "dev": true,
       "requires": {
-        "async": "^1.4.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.4.4",
-        "uglify-js": "^2.6"
+        "async": "1.5.2",
+        "optimist": "0.6.1",
+        "source-map": "0.4.4",
+        "uglify-js": "2.8.29"
       },
       "dependencies": {
         "async": {
@@ -6346,8 +6346,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "center-align": "^0.1.1",
-            "right-align": "^0.1.1",
+            "center-align": "0.1.3",
+            "right-align": "0.1.3",
             "wordwrap": "0.0.2"
           }
         },
@@ -6357,7 +6357,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         },
         "uglify-js": {
@@ -6367,9 +6367,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
+            "source-map": "0.5.7",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.10.0"
           },
           "dependencies": {
             "source-map": {
@@ -6388,9 +6388,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "camelcase": "^1.0.2",
-            "cliui": "^2.1.0",
-            "decamelize": "^1.0.0",
+            "camelcase": "1.2.1",
+            "cliui": "2.1.0",
+            "decamelize": "1.2.0",
             "window-size": "0.1.0"
           }
         }
@@ -6408,8 +6408,8 @@
       "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
       "dev": true,
       "requires": {
-        "ajv": "^4.9.1",
-        "har-schema": "^1.0.5"
+        "ajv": "4.11.8",
+        "har-schema": "1.0.5"
       },
       "dependencies": {
         "ajv": {
@@ -6418,8 +6418,8 @@
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "json-stable-stringify": "^1.0.1"
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
           }
         }
       }
@@ -6430,7 +6430,7 @@
       "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
       "dev": true,
       "requires": {
-        "function-bind": "^1.0.2"
+        "function-bind": "1.1.1"
       }
     },
     "has-ansi": {
@@ -6439,7 +6439,7 @@
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       }
     },
     "has-binary": {
@@ -6477,7 +6477,7 @@
       "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
       "dev": true,
       "requires": {
-        "sparkles": "^1.0.0"
+        "sparkles": "1.0.0"
       }
     },
     "has-symbols": {
@@ -6498,9 +6498,9 @@
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
+        "get-value": "2.0.6",
+        "has-values": "1.0.0",
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "isobject": {
@@ -6517,8 +6517,8 @@
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -6527,7 +6527,7 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -6536,7 +6536,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -6547,7 +6547,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -6558,8 +6558,8 @@
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
       }
     },
     "hash.js": {
@@ -6568,8 +6568,8 @@
       "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.0"
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "hawk": {
@@ -6578,10 +6578,10 @@
       "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
       "dev": true,
       "requires": {
-        "boom": "2.x.x",
-        "cryptiles": "2.x.x",
-        "hoek": "2.x.x",
-        "sntp": "1.x.x"
+        "boom": "2.10.1",
+        "cryptiles": "2.0.5",
+        "hoek": "2.16.3",
+        "sntp": "1.0.9"
       }
     },
     "he": {
@@ -6596,9 +6596,9 @@
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
       "dev": true,
       "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "hash.js": "1.1.3",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
       }
     },
     "hoek": {
@@ -6613,7 +6613,7 @@
       "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
       "dev": true,
       "requires": {
-        "parse-passwd": "^1.0.0"
+        "parse-passwd": "1.0.0"
       }
     },
     "hosted-git-info": {
@@ -6628,10 +6628,10 @@
       "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
+        "inherits": "2.0.3",
+        "obuf": "1.1.2",
+        "readable-stream": "2.3.4",
+        "wbuf": "1.7.3"
       }
     },
     "html-entities": {
@@ -6646,13 +6646,13 @@
       "integrity": "sha512-OZa4rfb6tZOZ3Z8Xf0jKxXkiDcFWldQePGYFDcgKqES2sXeWaEv9y6QQvWUtX3ySI3feApQi5uCsHLINQ6NoAw==",
       "dev": true,
       "requires": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.1.x",
-        "commander": "2.15.x",
-        "he": "1.1.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.3.x"
+        "camel-case": "3.0.0",
+        "clean-css": "4.1.11",
+        "commander": "2.15.1",
+        "he": "1.1.1",
+        "param-case": "2.1.1",
+        "relateurl": "0.2.7",
+        "uglify-js": "3.3.24"
       },
       "dependencies": {
         "commander": {
@@ -6675,12 +6675,12 @@
       "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
       "dev": true,
       "requires": {
-        "html-minifier": "^3.2.3",
-        "loader-utils": "^0.2.16",
-        "lodash": "^4.17.3",
-        "pretty-error": "^2.0.2",
-        "tapable": "^1.0.0",
-        "toposort": "^1.0.0",
+        "html-minifier": "3.5.15",
+        "loader-utils": "0.2.17",
+        "lodash": "4.17.5",
+        "pretty-error": "2.1.1",
+        "tapable": "1.0.0",
+        "toposort": "1.0.7",
         "util.promisify": "1.0.0"
       },
       "dependencies": {
@@ -6690,10 +6690,10 @@
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
           "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0",
-            "object-assign": "^4.0.1"
+            "big.js": "3.2.0",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1",
+            "object-assign": "4.1.1"
           }
         }
       }
@@ -6704,10 +6704,10 @@
       "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
       "dev": true,
       "requires": {
-        "domelementtype": "1",
-        "domhandler": "2.1",
-        "domutils": "1.1",
-        "readable-stream": "1.0"
+        "domelementtype": "1.3.0",
+        "domhandler": "2.1.0",
+        "domutils": "1.1.6",
+        "readable-stream": "1.0.34"
       },
       "dependencies": {
         "domutils": {
@@ -6716,7 +6716,7 @@
           "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=",
           "dev": true,
           "requires": {
-            "domelementtype": "1"
+            "domelementtype": "1.3.0"
           }
         },
         "isarray": {
@@ -6731,10 +6731,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "string_decoder": {
@@ -6753,7 +6753,7 @@
       "requires": {
         "apache-crypt": "1.1.2",
         "apache-md5": "1.0.6",
-        "node-uuid": "^1.4.7"
+        "node-uuid": "1.4.8"
       },
       "dependencies": {
         "node-uuid": {
@@ -6779,7 +6779,7 @@
         "depd": "1.1.1",
         "inherits": "2.0.3",
         "setprototypeof": "1.0.3",
-        "statuses": ">= 1.3.1 < 2"
+        "statuses": "1.3.1"
       },
       "dependencies": {
         "depd": {
@@ -6808,8 +6808,8 @@
       "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
       "dev": true,
       "requires": {
-        "eventemitter3": "1.x.x",
-        "requires-port": "1.x.x"
+        "eventemitter3": "1.2.0",
+        "requires-port": "1.0.0"
       }
     },
     "http-proxy-middleware": {
@@ -6818,10 +6818,10 @@
       "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
       "dev": true,
       "requires": {
-        "http-proxy": "^1.16.2",
-        "is-glob": "^4.0.0",
-        "lodash": "^4.17.5",
-        "micromatch": "^3.1.9"
+        "http-proxy": "1.16.2",
+        "is-glob": "4.0.0",
+        "lodash": "4.17.5",
+        "micromatch": "3.1.10"
       },
       "dependencies": {
         "arr-diff": {
@@ -6842,16 +6842,16 @@
           "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
+            "arr-flatten": "1.1.0",
+            "array-unique": "0.3.2",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.2",
+            "snapdragon": "0.8.2",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "extend-shallow": {
@@ -6860,7 +6860,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -6871,13 +6871,13 @@
           "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
           "dev": true,
           "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "define-property": {
@@ -6886,7 +6886,7 @@
               "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
               "dev": true,
               "requires": {
-                "is-descriptor": "^0.1.0"
+                "is-descriptor": "0.1.6"
               }
             },
             "extend-shallow": {
@@ -6895,7 +6895,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             },
             "is-accessor-descriptor": {
@@ -6904,7 +6904,7 @@
               "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
               "dev": true,
               "requires": {
-                "kind-of": "^3.0.2"
+                "kind-of": "3.2.2"
               },
               "dependencies": {
                 "kind-of": {
@@ -6913,7 +6913,7 @@
                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                   "dev": true,
                   "requires": {
-                    "is-buffer": "^1.1.5"
+                    "is-buffer": "1.1.6"
                   }
                 }
               }
@@ -6924,7 +6924,7 @@
               "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
               "dev": true,
               "requires": {
-                "kind-of": "^3.0.2"
+                "kind-of": "3.2.2"
               },
               "dependencies": {
                 "kind-of": {
@@ -6933,7 +6933,7 @@
                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                   "dev": true,
                   "requires": {
-                    "is-buffer": "^1.1.5"
+                    "is-buffer": "1.1.6"
                   }
                 }
               }
@@ -6944,9 +6944,9 @@
               "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
               "dev": true,
               "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
               }
             },
             "kind-of": {
@@ -6963,14 +6963,14 @@
           "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
           "dev": true,
           "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "define-property": {
@@ -6979,7 +6979,7 @@
               "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
               "dev": true,
               "requires": {
-                "is-descriptor": "^1.0.0"
+                "is-descriptor": "1.0.2"
               }
             },
             "extend-shallow": {
@@ -6988,7 +6988,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -6999,10 +6999,10 @@
           "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
           },
           "dependencies": {
             "extend-shallow": {
@@ -7011,7 +7011,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -7022,7 +7022,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -7031,7 +7031,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -7040,9 +7040,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         },
         "is-extglob": {
@@ -7057,7 +7057,7 @@
           "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.1"
+            "is-extglob": "2.1.1"
           }
         },
         "is-number": {
@@ -7066,7 +7066,7 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -7075,7 +7075,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -7098,19 +7098,19 @@
           "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.9",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           }
         }
       }
@@ -7121,9 +7121,9 @@
       "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
       "dev": true,
       "requires": {
-        "assert-plus": "^0.2.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "assert-plus": "0.2.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.13.1"
       }
     },
     "https-browserify": {
@@ -7138,9 +7138,9 @@
       "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
       "dev": true,
       "requires": {
-        "agent-base": "2",
-        "debug": "2",
-        "extend": "3"
+        "agent-base": "2.1.1",
+        "debug": "2.6.9",
+        "extend": "3.0.1"
       }
     },
     "husky": {
@@ -7149,10 +7149,10 @@
       "integrity": "sha1-vCBmCAutyLj+NRbogfW8aKVwUv8=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "find-parent-dir": "^0.3.0",
-        "is-ci": "^1.0.9",
-        "normalize-path": "^1.0.0"
+        "chalk": "1.1.3",
+        "find-parent-dir": "0.3.0",
+        "is-ci": "1.1.0",
+        "normalize-path": "1.0.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -7167,11 +7167,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "normalize-path": {
@@ -7218,8 +7218,8 @@
       "integrity": "sha1-2ln7hYl25KXkNwLM0fKC/byeV1Y=",
       "dev": true,
       "requires": {
-        "editions": "^1.3.3",
-        "ignorepatterns": "^1.1.0"
+        "editions": "1.3.4",
+        "ignorepatterns": "1.1.0"
       }
     },
     "ignorepatterns": {
@@ -7241,8 +7241,8 @@
       "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
       "dev": true,
       "requires": {
-        "pkg-dir": "^2.0.0",
-        "resolve-cwd": "^2.0.0"
+        "pkg-dir": "2.0.0",
+        "resolve-cwd": "2.0.0"
       }
     },
     "imurmurhash": {
@@ -7263,7 +7263,7 @@
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "repeating": "2.0.1"
       }
     },
     "indexes-of": {
@@ -7284,8 +7284,8 @@
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
       }
     },
     "inherits": {
@@ -7306,7 +7306,7 @@
       "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=",
       "dev": true,
       "requires": {
-        "meow": "^3.3.0"
+        "meow": "3.7.0"
       }
     },
     "interpret": {
@@ -7331,7 +7331,7 @@
       "integrity": "sha512-7Z5PPegwDTyjbaeCnV0efcyS6vdKAU51kpEmS7QFib3P4822l8ICYyMn7qvJnc+WzLoDsuI9gPMKbJ8pCu8XtA==",
       "dev": true,
       "requires": {
-        "loose-envify": "^1.0.0"
+        "loose-envify": "1.3.1"
       }
     },
     "invert-kv": {
@@ -7369,7 +7369,7 @@
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       }
     },
     "is-arrayish": {
@@ -7384,7 +7384,7 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "^1.0.0"
+        "binary-extensions": "1.11.0"
       }
     },
     "is-buffer": {
@@ -7399,7 +7399,7 @@
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "dev": true,
       "requires": {
-        "builtin-modules": "^1.0.0"
+        "builtin-modules": "1.1.1"
       }
     },
     "is-callable": {
@@ -7414,7 +7414,7 @@
       "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
       "dev": true,
       "requires": {
-        "ci-info": "^1.0.0"
+        "ci-info": "1.1.2"
       }
     },
     "is-data-descriptor": {
@@ -7423,7 +7423,7 @@
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       }
     },
     "is-date-object": {
@@ -7438,9 +7438,9 @@
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "0.1.6",
+        "is-data-descriptor": "0.1.4",
+        "kind-of": "5.1.0"
       },
       "dependencies": {
         "kind-of": {
@@ -7469,7 +7469,7 @@
       "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
       "dev": true,
       "requires": {
-        "is-primitive": "^2.0.0"
+        "is-primitive": "2.0.0"
       }
     },
     "is-extendable": {
@@ -7490,7 +7490,7 @@
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-fullwidth-code-point": {
@@ -7499,7 +7499,7 @@
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-glob": {
@@ -7508,7 +7508,7 @@
       "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
       "dev": true,
       "requires": {
-        "is-extglob": "^1.0.0"
+        "is-extglob": "1.0.0"
       }
     },
     "is-my-ip-valid": {
@@ -7523,11 +7523,11 @@
       "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
       "dev": true,
       "requires": {
-        "generate-function": "^2.0.0",
-        "generate-object-property": "^1.1.0",
-        "is-my-ip-valid": "^1.0.0",
-        "jsonpointer": "^4.0.0",
-        "xtend": "^4.0.0"
+        "generate-function": "2.0.0",
+        "generate-object-property": "1.2.0",
+        "is-my-ip-valid": "1.0.0",
+        "jsonpointer": "4.0.1",
+        "xtend": "4.0.1"
       }
     },
     "is-number": {
@@ -7536,7 +7536,7 @@
       "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       }
     },
     "is-obj": {
@@ -7551,7 +7551,7 @@
       "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
       "dev": true,
       "requires": {
-        "is-number": "^4.0.0"
+        "is-number": "4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -7574,7 +7574,7 @@
       "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
       "dev": true,
       "requires": {
-        "is-path-inside": "^1.0.0"
+        "is-path-inside": "1.0.1"
       }
     },
     "is-path-inside": {
@@ -7583,7 +7583,7 @@
       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "dev": true,
       "requires": {
-        "path-is-inside": "^1.0.1"
+        "path-is-inside": "1.0.2"
       }
     },
     "is-plain-obj": {
@@ -7598,7 +7598,7 @@
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.1"
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "isobject": {
@@ -7633,7 +7633,7 @@
       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
       "dev": true,
       "requires": {
-        "has": "^1.0.1"
+        "has": "1.0.1"
       }
     },
     "is-regexp": {
@@ -7672,7 +7672,7 @@
       "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
       "dev": true,
       "requires": {
-        "text-extensions": "^1.0.0"
+        "text-extensions": "1.7.0"
       }
     },
     "is-typedarray": {
@@ -7738,20 +7738,20 @@
       "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
       "dev": true,
       "requires": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.8.x",
-        "esprima": "2.7.x",
-        "glob": "^5.0.15",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
+        "abbrev": "1.0.9",
+        "async": "1.5.2",
+        "escodegen": "1.8.1",
+        "esprima": "2.7.3",
+        "glob": "5.0.15",
+        "handlebars": "4.0.11",
+        "js-yaml": "3.10.0",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "once": "1.4.0",
+        "resolve": "1.1.7",
+        "supports-color": "3.2.3",
+        "which": "1.3.0",
+        "wordwrap": "1.0.0"
       },
       "dependencies": {
         "async": {
@@ -7772,11 +7772,11 @@
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
           "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "has-flag": {
@@ -7797,7 +7797,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         },
         "wordwrap": {
@@ -7814,17 +7814,17 @@
       "integrity": "sha512-kH5YRdqdbs5hiH4/Rr1Q0cSAGgjh3jTtg8vu9NLebBAoK3adVO4jk81J+TYOkTr2+Q4NLeb1ACvmEt65iG/Vbw==",
       "dev": true,
       "requires": {
-        "async": "^2.1.4",
-        "fileset": "^2.0.2",
-        "istanbul-lib-coverage": "^1.1.2",
-        "istanbul-lib-hook": "^1.1.0",
-        "istanbul-lib-instrument": "^1.9.2",
-        "istanbul-lib-report": "^1.1.3",
-        "istanbul-lib-source-maps": "^1.2.3",
-        "istanbul-reports": "^1.1.4",
-        "js-yaml": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "once": "^1.4.0"
+        "async": "2.6.0",
+        "fileset": "2.0.3",
+        "istanbul-lib-coverage": "1.1.2",
+        "istanbul-lib-hook": "1.1.0",
+        "istanbul-lib-instrument": "1.9.2",
+        "istanbul-lib-report": "1.1.3",
+        "istanbul-lib-source-maps": "1.2.3",
+        "istanbul-reports": "1.1.4",
+        "js-yaml": "3.10.0",
+        "mkdirp": "0.5.1",
+        "once": "1.4.0"
       }
     },
     "istanbul-instrumenter-loader": {
@@ -7833,10 +7833,10 @@
       "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
       "dev": true,
       "requires": {
-        "convert-source-map": "^1.5.0",
-        "istanbul-lib-instrument": "^1.7.3",
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^0.3.0"
+        "convert-source-map": "1.5.1",
+        "istanbul-lib-instrument": "1.9.2",
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.3.0"
       },
       "dependencies": {
         "ajv": {
@@ -7845,10 +7845,10 @@
           "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
+            "co": "4.6.0",
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
           }
         },
         "schema-utils": {
@@ -7857,7 +7857,7 @@
           "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
           "dev": true,
           "requires": {
-            "ajv": "^5.0.0"
+            "ajv": "5.5.2"
           }
         }
       }
@@ -7874,7 +7874,7 @@
       "integrity": "sha512-U3qEgwVDUerZ0bt8cfl3dSP3S6opBoOtk3ROO5f2EfBr/SRiD9FQqzwaZBqFORu8W7O0EXpai+k7kxHK13beRg==",
       "dev": true,
       "requires": {
-        "append-transform": "^0.4.0"
+        "append-transform": "0.4.0"
       }
     },
     "istanbul-lib-instrument": {
@@ -7883,13 +7883,13 @@
       "integrity": "sha512-nz8t4HQ2206a/3AXi+NHFWEa844DMpPsgbcUteJbt1j8LX1xg56H9rOMnhvcvVvPbW60qAIyrSk44H8ZDqaSSA==",
       "dev": true,
       "requires": {
-        "babel-generator": "^6.18.0",
-        "babel-template": "^6.16.0",
-        "babel-traverse": "^6.18.0",
-        "babel-types": "^6.18.0",
-        "babylon": "^6.18.0",
-        "istanbul-lib-coverage": "^1.1.2",
-        "semver": "^5.3.0"
+        "babel-generator": "6.26.1",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "istanbul-lib-coverage": "1.1.2",
+        "semver": "5.5.0"
       }
     },
     "istanbul-lib-report": {
@@ -7898,10 +7898,10 @@
       "integrity": "sha512-D4jVbMDtT2dPmloPJS/rmeP626N5Pr3Rp+SovrPn1+zPChGHcggd/0sL29jnbm4oK9W0wHjCRsdch9oLd7cm6g==",
       "dev": true,
       "requires": {
-        "istanbul-lib-coverage": "^1.1.2",
-        "mkdirp": "^0.5.1",
-        "path-parse": "^1.0.5",
-        "supports-color": "^3.1.2"
+        "istanbul-lib-coverage": "1.1.2",
+        "mkdirp": "0.5.1",
+        "path-parse": "1.0.5",
+        "supports-color": "3.2.3"
       },
       "dependencies": {
         "has-flag": {
@@ -7916,7 +7916,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -7927,11 +7927,11 @@
       "integrity": "sha512-fDa0hwU/5sDXwAklXgAoCJCOsFsBplVQ6WBldz5UwaqOzmDhUK4nfuR7/G//G2lERlblUNJB8P6e8cXq3a7MlA==",
       "dev": true,
       "requires": {
-        "debug": "^3.1.0",
-        "istanbul-lib-coverage": "^1.1.2",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.6.1",
-        "source-map": "^0.5.3"
+        "debug": "3.1.0",
+        "istanbul-lib-coverage": "1.1.2",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.1",
+        "source-map": "0.5.7"
       },
       "dependencies": {
         "debug": {
@@ -7951,7 +7951,7 @@
       "integrity": "sha512-DfSTVOTkuO+kRmbO8Gk650Wqm1WRGr6lrdi2EwDK1vxpS71vdlLd613EpzOKdIFioB5f/scJTjeWBnvd1FWejg==",
       "dev": true,
       "requires": {
-        "handlebars": "^4.0.3"
+        "handlebars": "4.0.11"
       }
     },
     "jasmine": {
@@ -7960,9 +7960,9 @@
       "integrity": "sha1-jKctEC5jm4Z8ZImFbg4YqceqQrc=",
       "dev": true,
       "requires": {
-        "exit": "^0.1.2",
-        "glob": "^7.0.6",
-        "jasmine-core": "~2.99.0"
+        "exit": "0.1.2",
+        "glob": "7.1.2",
+        "jasmine-core": "2.99.1"
       },
       "dependencies": {
         "jasmine-core": {
@@ -8012,8 +8012,8 @@
       "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
       "dev": true,
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "1.0.10",
+        "esprima": "4.0.0"
       }
     },
     "jsbn": {
@@ -8053,7 +8053,7 @@
       "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
       "dev": true,
       "requires": {
-        "jsonify": "~0.0.0"
+        "jsonify": "0.0.0"
       }
     },
     "json-stringify-safe": {
@@ -8080,7 +8080,7 @@
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.6"
+        "graceful-fs": "4.1.11"
       }
     },
     "jsonfilter": {
@@ -8089,10 +8089,10 @@
       "integrity": "sha1-Ie987cdRk4E8dZMulqmL4gW6WhE=",
       "dev": true,
       "requires": {
-        "JSONStream": "^0.8.4",
-        "minimist": "^1.1.0",
-        "stream-combiner": "^0.2.1",
-        "through2": "^0.6.3"
+        "JSONStream": "0.8.4",
+        "minimist": "1.2.0",
+        "stream-combiner": "0.2.2",
+        "through2": "0.6.5"
       },
       "dependencies": {
         "JSONStream": {
@@ -8102,7 +8102,7 @@
           "dev": true,
           "requires": {
             "jsonparse": "0.0.5",
-            "through": ">=2.2.7 <3"
+            "through": "2.3.8"
           }
         },
         "isarray": {
@@ -8129,10 +8129,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "stream-combiner": {
@@ -8141,8 +8141,8 @@
           "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
           "dev": true,
           "requires": {
-            "duplexer": "~0.1.1",
-            "through": "~2.3.4"
+            "duplexer": "0.1.1",
+            "through": "2.3.8"
           }
         },
         "string_decoder": {
@@ -8157,8 +8157,8 @@
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
           "requires": {
-            "readable-stream": ">=1.0.33-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
+            "readable-stream": "1.0.34",
+            "xtend": "4.0.1"
           }
         }
       }
@@ -8207,33 +8207,33 @@
       "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.3.0",
-        "body-parser": "^1.16.1",
-        "chokidar": "^1.4.1",
-        "colors": "^1.1.0",
-        "combine-lists": "^1.0.0",
-        "connect": "^3.6.0",
-        "core-js": "^2.2.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.0",
-        "expand-braces": "^0.1.1",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.1.2",
-        "http-proxy": "^1.13.0",
-        "isbinaryfile": "^3.0.0",
-        "lodash": "^3.8.0",
-        "log4js": "^0.6.31",
-        "mime": "^1.3.4",
-        "minimatch": "^3.0.2",
-        "optimist": "^0.6.1",
-        "qjobs": "^1.1.4",
-        "range-parser": "^1.2.0",
-        "rimraf": "^2.6.0",
-        "safe-buffer": "^5.0.1",
+        "bluebird": "3.5.1",
+        "body-parser": "1.18.2",
+        "chokidar": "1.7.0",
+        "colors": "1.1.2",
+        "combine-lists": "1.0.1",
+        "connect": "3.6.6",
+        "core-js": "2.5.1",
+        "di": "0.0.1",
+        "dom-serialize": "2.2.1",
+        "expand-braces": "0.1.2",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "http-proxy": "1.16.2",
+        "isbinaryfile": "3.0.2",
+        "lodash": "3.10.1",
+        "log4js": "0.6.38",
+        "mime": "1.6.0",
+        "minimatch": "3.0.4",
+        "optimist": "0.6.1",
+        "qjobs": "1.2.0",
+        "range-parser": "1.2.0",
+        "rimraf": "2.6.1",
+        "safe-buffer": "5.1.1",
         "socket.io": "1.7.3",
-        "source-map": "^0.5.3",
+        "source-map": "0.5.7",
         "tmp": "0.0.31",
-        "useragent": "^2.1.12"
+        "useragent": "2.3.0"
       },
       "dependencies": {
         "connect": {
@@ -8244,7 +8244,7 @@
           "requires": {
             "debug": "2.6.9",
             "finalhandler": "1.1.0",
-            "parseurl": "~1.3.2",
+            "parseurl": "1.3.2",
             "utils-merge": "1.0.1"
           }
         },
@@ -8262,8 +8262,8 @@
       "integrity": "sha1-IWh5xorATY1RQOmWGboEtZr9Rs8=",
       "dev": true,
       "requires": {
-        "fs-access": "^1.0.0",
-        "which": "^1.2.1"
+        "fs-access": "1.0.1",
+        "which": "1.3.0"
       }
     },
     "karma-cli": {
@@ -8272,7 +8272,7 @@
       "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "resolve": "1.5.0"
       }
     },
     "karma-coverage-istanbul-reporter": {
@@ -8281,8 +8281,8 @@
       "integrity": "sha1-0ULNnFVzHJ42Pvc3To7xoxvr+ts=",
       "dev": true,
       "requires": {
-        "istanbul-api": "^1.1.8",
-        "minimatch": "^3.0.4"
+        "istanbul-api": "1.2.2",
+        "minimatch": "3.0.4"
       }
     },
     "karma-jasmine": {
@@ -8297,7 +8297,7 @@
       "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=",
       "dev": true,
       "requires": {
-        "karma-jasmine": "^1.0.2"
+        "karma-jasmine": "1.1.0"
       }
     },
     "karma-source-map-support": {
@@ -8306,7 +8306,7 @@
       "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==",
       "dev": true,
       "requires": {
-        "source-map-support": "^0.5.5"
+        "source-map-support": "0.5.5"
       },
       "dependencies": {
         "source-map": {
@@ -8321,8 +8321,8 @@
           "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==",
           "dev": true,
           "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
+            "buffer-from": "1.0.0",
+            "source-map": "0.6.1"
           }
         }
       }
@@ -8339,7 +8339,7 @@
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "requires": {
-        "is-buffer": "^1.1.5"
+        "is-buffer": "1.1.6"
       }
     },
     "known-css-properties": {
@@ -8354,7 +8354,7 @@
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "dev": true,
       "requires": {
-        "invert-kv": "^1.0.0"
+        "invert-kv": "1.0.0"
       }
     },
     "ldjson-stream": {
@@ -8363,8 +8363,8 @@
       "integrity": "sha1-kb7O2lrE7SsX5kn7d356v6AYnCs=",
       "dev": true,
       "requires": {
-        "split2": "^0.2.1",
-        "through2": "^0.6.1"
+        "split2": "0.2.1",
+        "through2": "0.6.5"
       },
       "dependencies": {
         "isarray": {
@@ -8379,10 +8379,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "split2": {
@@ -8391,7 +8391,7 @@
           "integrity": "sha1-At2smtwD7Au3jBKC7Aecpuha6QA=",
           "dev": true,
           "requires": {
-            "through2": "~0.6.1"
+            "through2": "0.6.5"
           }
         },
         "string_decoder": {
@@ -8406,8 +8406,8 @@
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
           "requires": {
-            "readable-stream": ">=1.0.33-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
+            "readable-stream": "1.0.34",
+            "xtend": "4.0.1"
           }
         }
       }
@@ -8423,14 +8423,14 @@
       "integrity": "sha512-q3SyEnPKbk9zh4l36PGeW2fgynKu+FpbhiUNx/yaiBUQ3V0CbACCgb9FzYWcRgI2DJlP6eI4jc8XPrCTi55YcQ==",
       "dev": true,
       "requires": {
-        "errno": "^0.1.1",
-        "graceful-fs": "^4.1.2",
-        "image-size": "~0.5.0",
-        "mime": "^1.4.1",
-        "mkdirp": "^0.5.0",
-        "promise": "^7.1.1",
-        "request": "^2.83.0",
-        "source-map": "~0.6.0"
+        "errno": "0.1.7",
+        "graceful-fs": "4.1.11",
+        "image-size": "0.5.5",
+        "mime": "1.6.0",
+        "mkdirp": "0.5.1",
+        "promise": "7.3.1",
+        "request": "2.85.0",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "ajv": {
@@ -8440,10 +8440,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
+            "co": "4.6.0",
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
           }
         },
         "assert-plus": {
@@ -8467,7 +8467,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "hoek": "4.x.x"
+            "hoek": "4.2.1"
           }
         },
         "cryptiles": {
@@ -8477,7 +8477,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "boom": "5.x.x"
+            "boom": "5.2.0"
           },
           "dependencies": {
             "boom": {
@@ -8487,7 +8487,7 @@
               "dev": true,
               "optional": true,
               "requires": {
-                "hoek": "4.x.x"
+                "hoek": "4.2.1"
               }
             }
           }
@@ -8499,9 +8499,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "asynckit": "^0.4.0",
+            "asynckit": "0.4.0",
             "combined-stream": "1.0.6",
-            "mime-types": "^2.1.12"
+            "mime-types": "2.1.18"
           }
         },
         "har-schema": {
@@ -8518,8 +8518,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ajv": "^5.1.0",
-            "har-schema": "^2.0.0"
+            "ajv": "5.5.2",
+            "har-schema": "2.0.0"
           }
         },
         "hawk": {
@@ -8529,10 +8529,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "boom": "4.x.x",
-            "cryptiles": "3.x.x",
-            "hoek": "4.x.x",
-            "sntp": "2.x.x"
+            "boom": "4.3.1",
+            "cryptiles": "3.1.2",
+            "hoek": "4.2.1",
+            "sntp": "2.1.0"
           }
         },
         "hoek": {
@@ -8548,9 +8548,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "^1.0.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
+            "assert-plus": "1.0.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.13.1"
           }
         },
         "performance-now": {
@@ -8574,28 +8574,28 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.6.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.5",
-            "extend": "~3.0.1",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.1",
-            "har-validator": "~5.0.3",
-            "hawk": "~6.0.2",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.17",
-            "oauth-sign": "~0.8.2",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.1",
-            "safe-buffer": "^5.1.1",
-            "stringstream": "~0.0.5",
-            "tough-cookie": "~2.3.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.1.0"
+            "aws-sign2": "0.7.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.6",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.3.2",
+            "har-validator": "5.0.3",
+            "hawk": "6.0.2",
+            "http-signature": "1.2.0",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.18",
+            "oauth-sign": "0.8.2",
+            "performance-now": "2.1.0",
+            "qs": "6.5.2",
+            "safe-buffer": "5.1.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.2.1"
           }
         },
         "sntp": {
@@ -8605,7 +8605,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "hoek": "4.x.x"
+            "hoek": "4.2.1"
           }
         },
         "source-map": {
@@ -8623,9 +8623,9 @@
       "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
       "dev": true,
       "requires": {
-        "clone": "^2.1.1",
-        "loader-utils": "^1.1.0",
-        "pify": "^3.0.0"
+        "clone": "2.1.1",
+        "loader-utils": "1.1.0",
+        "pify": "3.0.0"
       }
     },
     "levn": {
@@ -8634,8 +8634,8 @@
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
       }
     },
     "license-webpack-plugin": {
@@ -8644,7 +8644,7 @@
       "integrity": "sha512-NqAFodJdpBUuf1iD+Ij8hQvF0rCFKlO2KaieoQzAPhFgzLCtJnC7Z7x5gQbGNjoe++wOKAtAmwVEIBLqq2Yp1A==",
       "dev": true,
       "requires": {
-        "ejs": "^2.5.7"
+        "ejs": "2.6.1"
       }
     },
     "live-server": {
@@ -8653,19 +8653,19 @@
       "integrity": "sha1-pp8ObKWB4DkapXlBlw4XwwjdSGk=",
       "dev": true,
       "requires": {
-        "colors": "^1.3.0",
-        "connect": "3.4.x",
-        "cors": "^2.8.4",
-        "event-stream": "^3.3.4",
-        "faye-websocket": "0.11.x",
-        "http-auth": "2.4.x",
-        "morgan": "^1.6.1",
-        "object-assign": "^4.1.1",
-        "opn": "^5.3.0",
-        "proxy-middleware": "^0.15.0",
-        "send": "^0.16.2",
-        "serve-index": "^1.7.2",
-        "watchr": "2.6.x"
+        "colors": "1.3.0",
+        "connect": "3.4.1",
+        "cors": "2.8.4",
+        "event-stream": "3.3.4",
+        "faye-websocket": "0.11.1",
+        "http-auth": "2.4.11",
+        "morgan": "1.9.0",
+        "object-assign": "4.1.1",
+        "opn": "5.3.0",
+        "proxy-middleware": "0.15.0",
+        "send": "0.16.2",
+        "serve-index": "1.9.1",
+        "watchr": "2.6.0"
       },
       "dependencies": {
         "colors": {
@@ -8680,13 +8680,13 @@
           "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
           "dev": true,
           "requires": {
-            "duplexer": "~0.1.1",
-            "from": "~0",
-            "map-stream": "~0.1.0",
+            "duplexer": "0.1.1",
+            "from": "0.1.7",
+            "map-stream": "0.1.0",
             "pause-stream": "0.0.11",
-            "split": "0.3",
-            "stream-combiner": "~0.0.4",
-            "through": "~2.3.1"
+            "split": "0.3.3",
+            "stream-combiner": "0.0.4",
+            "through": "2.3.8"
           }
         },
         "faye-websocket": {
@@ -8695,7 +8695,7 @@
           "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
           "dev": true,
           "requires": {
-            "websocket-driver": ">=0.5.1"
+            "websocket-driver": "0.7.0"
           }
         },
         "mime": {
@@ -8716,7 +8716,7 @@
           "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
           "dev": true,
           "requires": {
-            "is-wsl": "^1.1.0"
+            "is-wsl": "1.1.0"
           }
         },
         "send": {
@@ -8726,18 +8726,18 @@
           "dev": true,
           "requires": {
             "debug": "2.6.9",
-            "depd": "~1.1.2",
-            "destroy": "~1.0.4",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "etag": "~1.8.1",
+            "depd": "1.1.2",
+            "destroy": "1.0.4",
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "etag": "1.8.1",
             "fresh": "0.5.2",
-            "http-errors": "~1.6.2",
+            "http-errors": "1.6.2",
             "mime": "1.4.1",
             "ms": "2.0.0",
-            "on-finished": "~2.3.0",
-            "range-parser": "~1.2.0",
-            "statuses": "~1.4.0"
+            "on-finished": "2.3.0",
+            "range-parser": "1.2.0",
+            "statuses": "1.4.0"
           }
         },
         "statuses": {
@@ -8754,11 +8754,11 @@
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
       },
       "dependencies": {
         "pify": {
@@ -8781,9 +8781,9 @@
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
       "dev": true,
       "requires": {
-        "big.js": "^3.1.3",
-        "emojis-list": "^2.0.0",
-        "json5": "^0.5.0"
+        "big.js": "3.2.0",
+        "emojis-list": "2.1.0",
+        "json5": "0.5.1"
       }
     },
     "locate-path": {
@@ -8792,8 +8792,8 @@
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
       "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "2.0.0",
+        "path-exists": "3.0.0"
       }
     },
     "lodash": {
@@ -8873,7 +8873,7 @@
       "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
       "dev": true,
       "requires": {
-        "lodash._root": "^3.0.0"
+        "lodash._root": "3.0.1"
       }
     },
     "lodash.isarguments": {
@@ -8894,9 +8894,9 @@
       "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
       "dev": true,
       "requires": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
+        "lodash._getnative": "3.9.1",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isarray": "3.0.4"
       }
     },
     "lodash.mergewith": {
@@ -8923,15 +8923,15 @@
       "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
       "dev": true,
       "requires": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash._basetostring": "^3.0.0",
-        "lodash._basevalues": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0",
-        "lodash.keys": "^3.0.0",
-        "lodash.restparam": "^3.0.0",
-        "lodash.templatesettings": "^3.0.0"
+        "lodash._basecopy": "3.0.1",
+        "lodash._basetostring": "3.0.1",
+        "lodash._basevalues": "3.0.0",
+        "lodash._isiterateecall": "3.0.9",
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.escape": "3.2.0",
+        "lodash.keys": "3.1.2",
+        "lodash.restparam": "3.6.1",
+        "lodash.templatesettings": "3.1.1"
       }
     },
     "lodash.templatesettings": {
@@ -8940,8 +8940,8 @@
       "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
       "dev": true,
       "requires": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0"
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.escape": "3.2.0"
       }
     },
     "log-symbols": {
@@ -8950,7 +8950,7 @@
       "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
       "dev": true,
       "requires": {
-        "chalk": "^1.0.0"
+        "chalk": "1.1.3"
       },
       "dependencies": {
         "ansi-styles": {
@@ -8965,11 +8965,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "supports-color": {
@@ -8986,8 +8986,8 @@
       "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
       "dev": true,
       "requires": {
-        "readable-stream": "~1.0.2",
-        "semver": "~4.3.3"
+        "readable-stream": "1.0.34",
+        "semver": "4.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -9002,10 +9002,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "semver": {
@@ -9034,8 +9034,8 @@
       "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==",
       "dev": true,
       "requires": {
-        "es6-symbol": "^3.1.1",
-        "object.assign": "^4.1.0"
+        "es6-symbol": "3.1.1",
+        "object.assign": "4.1.0"
       }
     },
     "longest": {
@@ -9050,7 +9050,7 @@
       "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
       "dev": true,
       "requires": {
-        "js-tokens": "^3.0.0"
+        "js-tokens": "3.0.2"
       }
     },
     "loud-rejection": {
@@ -9059,8 +9059,8 @@
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "dev": true,
       "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
       }
     },
     "lower-case": {
@@ -9075,8 +9075,8 @@
       "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
       "dev": true,
       "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
       }
     },
     "lunr": {
@@ -9097,7 +9097,7 @@
       "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
       "dev": true,
       "requires": {
-        "pify": "^3.0.0"
+        "pify": "3.0.0"
       }
     },
     "make-error": {
@@ -9130,7 +9130,7 @@
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "dev": true,
       "requires": {
-        "object-visit": "^1.0.0"
+        "object-visit": "1.0.1"
       }
     },
     "marked": {
@@ -9151,8 +9151,8 @@
       "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3"
       }
     },
     "media-typer": {
@@ -9167,7 +9167,7 @@
       "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
       "dev": true,
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "mimic-fn": "1.2.0"
       }
     },
     "memory-fs": {
@@ -9176,8 +9176,8 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
+        "errno": "0.1.7",
+        "readable-stream": "2.3.4"
       }
     },
     "meow": {
@@ -9186,16 +9186,16 @@
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.4.0",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -9224,19 +9224,19 @@
       "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
       "dev": true,
       "requires": {
-        "arr-diff": "^2.0.0",
-        "array-unique": "^0.2.1",
-        "braces": "^1.8.2",
-        "expand-brackets": "^0.1.4",
-        "extglob": "^0.3.1",
-        "filename-regex": "^2.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "normalize-path": "^2.0.1",
-        "object.omit": "^2.0.0",
-        "parse-glob": "^3.0.4",
-        "regex-cache": "^0.4.2"
+        "arr-diff": "2.0.0",
+        "array-unique": "0.2.1",
+        "braces": "1.8.5",
+        "expand-brackets": "0.1.5",
+        "extglob": "0.3.2",
+        "filename-regex": "2.0.1",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1",
+        "kind-of": "3.2.2",
+        "normalize-path": "2.1.1",
+        "object.omit": "2.0.1",
+        "parse-glob": "3.0.4",
+        "regex-cache": "0.4.4"
       }
     },
     "miller-rabin": {
@@ -9245,8 +9245,8 @@
       "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0"
       }
     },
     "mime": {
@@ -9267,7 +9267,7 @@
       "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
       "dev": true,
       "requires": {
-        "mime-db": "~1.33.0"
+        "mime-db": "1.33.0"
       }
     },
     "mimic-fn": {
@@ -9282,8 +9282,8 @@
       "integrity": "sha512-2Zik6PhUZ/MbiboG6SDS9UTPL4XXy4qnyGjSdCIWRrr8xb6PwLtHE+AYOjkXJWdF0OG8vo/yrJ8CgS5WbMpzIg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "webpack-sources": "^1.1.0"
+        "loader-utils": "1.1.0",
+        "webpack-sources": "1.1.0"
       }
     },
     "minimalistic-assert": {
@@ -9304,7 +9304,7 @@
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "1.1.11"
       }
     },
     "minimist": {
@@ -9319,8 +9319,8 @@
       "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0"
+        "arrify": "1.0.1",
+        "is-plain-obj": "1.1.0"
       }
     },
     "mississippi": {
@@ -9329,16 +9329,16 @@
       "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
       "dev": true,
       "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^2.0.1",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
+        "concat-stream": "1.6.2",
+        "duplexify": "3.6.0",
+        "end-of-stream": "1.4.1",
+        "flush-write-stream": "1.0.3",
+        "from2": "2.3.0",
+        "parallel-transform": "1.1.0",
+        "pump": "2.0.1",
+        "pumpify": "1.5.0",
+        "stream-each": "1.2.2",
+        "through2": "2.0.3"
       }
     },
     "mixin-deep": {
@@ -9347,8 +9347,8 @@
       "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
+        "for-in": "1.0.2",
+        "is-extendable": "1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -9357,7 +9357,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         }
       }
@@ -9368,8 +9368,8 @@
       "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
       "dev": true,
       "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
+        "for-in": "0.1.8",
+        "is-extendable": "0.1.1"
       },
       "dependencies": {
         "for-in": {
@@ -9416,11 +9416,11 @@
       "integrity": "sha1-0B+mxlhZt2/PMbPLU6OCGjEdgFE=",
       "dev": true,
       "requires": {
-        "basic-auth": "~2.0.0",
+        "basic-auth": "2.0.0",
         "debug": "2.6.9",
-        "depd": "~1.1.1",
-        "on-finished": "~2.3.0",
-        "on-headers": "~1.0.1"
+        "depd": "1.1.2",
+        "on-finished": "2.3.0",
+        "on-headers": "1.0.1"
       }
     },
     "move-concurrently": {
@@ -9429,12 +9429,12 @@
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
+        "aproba": "1.2.0",
+        "copy-concurrently": "1.0.5",
+        "fs-write-stream-atomic": "1.0.10",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.1",
+        "run-queue": "1.0.3"
       }
     },
     "ms": {
@@ -9449,8 +9449,8 @@
       "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
       "dev": true,
       "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
+        "dns-packet": "1.3.1",
+        "thunky": "1.0.2"
       }
     },
     "multicast-dns-service-types": {
@@ -9465,10 +9465,10 @@
       "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
       "dev": true,
       "requires": {
-        "array-differ": "^1.0.0",
-        "array-union": "^1.0.1",
-        "arrify": "^1.0.0",
-        "minimatch": "^3.0.0"
+        "array-differ": "1.0.0",
+        "array-union": "1.0.2",
+        "arrify": "1.0.1",
+        "minimatch": "3.0.4"
       }
     },
     "multipipe": {
@@ -9493,18 +9493,18 @@
       "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
       "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-odd": "^2.0.0",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "fragment-cache": "0.2.1",
+        "is-odd": "2.0.0",
+        "is-windows": "1.0.2",
+        "kind-of": "6.0.2",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "arr-diff": {
@@ -9528,9 +9528,9 @@
       }
     },
     "nebular-icons": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/nebular-icons/-/nebular-icons-1.0.9.tgz",
-      "integrity": "sha512-zz//MW0tXGI3ArzRTqxV5ySpsRKFd5O/gy0tHYgBsjvLXe9k0UF9tS1i7cro4CB2VrrKGbZAcIo7hIPX63HCmw=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/nebular-icons/-/nebular-icons-1.1.0.tgz",
+      "integrity": "sha512-4TkJgDrjXw8qsOsc2NN6OBlRJYAJJpvqtjV+gpv+NV6amPgMPQNNuEvbenYXAMFmjs3uShgKOvmpnCX8Ua1oWQ=="
     },
     "negotiator": {
       "version": "0.6.1",
@@ -9565,7 +9565,7 @@
       "resolved": "https://registry.npmjs.org/ng2-smart-table/-/ng2-smart-table-1.3.5.tgz",
       "integrity": "sha512-ZKrldgq9HxhXk1CATEDtcgpwXgrWkX0l3Quc+rFba+esQniiS3daIHZV5yTc77LNBrw7N1MzIPudqTrTWslAPw==",
       "requires": {
-        "lodash": "^4.17.10"
+        "lodash": "4.17.10"
       },
       "dependencies": {
         "lodash": {
@@ -9586,7 +9586,7 @@
       "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
       "dev": true,
       "requires": {
-        "lower-case": "^1.1.1"
+        "lower-case": "1.1.4"
       }
     },
     "node-forge": {
@@ -9601,19 +9601,19 @@
       "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
       "dev": true,
       "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "minimatch": "^3.0.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "2",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
+        "fstream": "1.0.11",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "npmlog": "4.1.2",
+        "osenv": "0.1.5",
+        "request": "2.81.0",
+        "rimraf": "2.6.1",
+        "semver": "5.3.0",
+        "tar": "2.2.1",
+        "which": "1.3.0"
       },
       "dependencies": {
         "semver": {
@@ -9630,28 +9630,28 @@
       "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
       "dev": true,
       "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^1.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
+        "assert": "1.4.1",
+        "browserify-zlib": "0.2.0",
+        "buffer": "4.9.1",
+        "console-browserify": "1.1.0",
+        "constants-browserify": "1.0.0",
+        "crypto-browserify": "3.12.0",
+        "domain-browser": "1.2.0",
+        "events": "1.1.1",
+        "https-browserify": "1.0.0",
+        "os-browserify": "0.3.0",
         "path-browserify": "0.0.0",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
+        "process": "0.11.10",
+        "punycode": "1.4.1",
+        "querystring-es3": "0.2.1",
+        "readable-stream": "2.3.4",
+        "stream-browserify": "2.0.1",
+        "stream-http": "2.8.2",
+        "string_decoder": "1.0.3",
+        "timers-browserify": "2.0.10",
         "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.10.3",
+        "url": "0.11.0",
+        "util": "0.10.3",
         "vm-browserify": "0.0.4"
       }
     },
@@ -9661,25 +9661,25 @@
       "integrity": "sha512-QFHfrZl6lqRU3csypwviz2XLgGNOoWQbo2GOvtsfQqOfL4cy1BtWnhx/XUeAO9LT3ahBzSRXcEO6DdvAH9DzSg==",
       "dev": true,
       "requires": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^3.0.0",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "in-publish": "^2.0.0",
-        "lodash.assign": "^4.2.0",
-        "lodash.clonedeep": "^4.3.2",
-        "lodash.mergewith": "^4.6.0",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.10.0",
-        "node-gyp": "^3.3.1",
-        "npmlog": "^4.0.0",
-        "request": "~2.79.0",
-        "sass-graph": "^2.2.4",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
+        "async-foreach": "0.1.3",
+        "chalk": "1.1.3",
+        "cross-spawn": "3.0.1",
+        "gaze": "1.1.2",
+        "get-stdin": "4.0.1",
+        "glob": "7.1.2",
+        "in-publish": "2.0.0",
+        "lodash.assign": "4.2.0",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.mergewith": "4.6.1",
+        "meow": "3.7.0",
+        "mkdirp": "0.5.1",
+        "nan": "2.10.0",
+        "node-gyp": "3.6.2",
+        "npmlog": "4.1.2",
+        "request": "2.79.0",
+        "sass-graph": "2.2.4",
+        "stdout-stream": "1.4.0",
+        "true-case-path": "1.0.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -9700,11 +9700,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "har-validator": {
@@ -9713,10 +9713,10 @@
           "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
           "dev": true,
           "requires": {
-            "chalk": "^1.1.1",
-            "commander": "^2.9.0",
-            "is-my-json-valid": "^2.12.4",
-            "pinkie-promise": "^2.0.0"
+            "chalk": "1.1.3",
+            "commander": "2.14.1",
+            "is-my-json-valid": "2.17.2",
+            "pinkie-promise": "2.0.1"
           }
         },
         "nan": {
@@ -9737,26 +9737,26 @@
           "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
           "dev": true,
           "requires": {
-            "aws-sign2": "~0.6.0",
-            "aws4": "^1.2.1",
-            "caseless": "~0.11.0",
-            "combined-stream": "~1.0.5",
-            "extend": "~3.0.0",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.1.1",
-            "har-validator": "~2.0.6",
-            "hawk": "~3.1.3",
-            "http-signature": "~1.1.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.7",
-            "oauth-sign": "~0.8.1",
-            "qs": "~6.3.0",
-            "stringstream": "~0.0.4",
-            "tough-cookie": "~2.3.0",
-            "tunnel-agent": "~0.4.1",
-            "uuid": "^3.0.0"
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.11.0",
+            "combined-stream": "1.0.6",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "2.0.6",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.18",
+            "oauth-sign": "0.8.2",
+            "qs": "6.3.2",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.4.3",
+            "uuid": "3.2.1"
           }
         },
         "supports-color": {
@@ -9779,7 +9779,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1"
+        "abbrev": "1.0.9"
       }
     },
     "normalize-package-data": {
@@ -9788,10 +9788,10 @@
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^2.1.4",
-        "is-builtin-module": "^1.0.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+        "hosted-git-info": "2.5.0",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.5.0",
+        "validate-npm-package-license": "3.0.1"
       }
     },
     "normalize-path": {
@@ -9800,7 +9800,7 @@
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "requires": {
-        "remove-trailing-separator": "^1.0.1"
+        "remove-trailing-separator": "1.1.0"
       }
     },
     "normalize-range": {
@@ -9826,10 +9826,10 @@
       "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^2.6.0",
-        "osenv": "^0.1.5",
-        "semver": "^5.5.0",
-        "validate-npm-package-name": "^3.0.0"
+        "hosted-git-info": "2.6.0",
+        "osenv": "0.1.5",
+        "semver": "5.5.0",
+        "validate-npm-package-name": "3.0.0"
       },
       "dependencies": {
         "hosted-git-info": {
@@ -9846,18 +9846,18 @@
       "integrity": "sha512-7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg==",
       "dev": true,
       "requires": {
-        "concat-stream": "^1.5.2",
-        "graceful-fs": "^4.1.6",
-        "normalize-package-data": "~1.0.1 || ^2.0.0",
-        "npm-package-arg": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0",
-        "npmlog": "2 || ^3.1.0 || ^4.0.0",
-        "once": "^1.3.3",
-        "request": "^2.74.0",
-        "retry": "^0.10.0",
-        "safe-buffer": "^5.1.1",
-        "semver": "2 >=2.2.1 || 3.x || 4 || 5",
-        "slide": "^1.1.3",
-        "ssri": "^5.2.4"
+        "concat-stream": "1.6.2",
+        "graceful-fs": "4.1.11",
+        "normalize-package-data": "2.4.0",
+        "npm-package-arg": "6.1.0",
+        "npmlog": "4.1.2",
+        "once": "1.4.0",
+        "request": "2.81.0",
+        "retry": "0.10.1",
+        "safe-buffer": "5.1.1",
+        "semver": "5.5.0",
+        "slide": "1.1.6",
+        "ssri": "5.3.0"
       }
     },
     "npm-run-all": {
@@ -9866,13 +9866,13 @@
       "integrity": "sha1-qEZpNI5ttsy+BSIAtM22v+A0pP4=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "cross-spawn": "^5.0.1",
-        "minimatch": "^3.0.2",
-        "ps-tree": "^1.0.1",
-        "read-pkg": "^2.0.0",
-        "shell-quote": "^1.6.1",
-        "string.prototype.padend": "^3.0.0"
+        "chalk": "1.1.3",
+        "cross-spawn": "5.1.0",
+        "minimatch": "3.0.4",
+        "ps-tree": "1.1.0",
+        "read-pkg": "2.0.0",
+        "shell-quote": "1.6.1",
+        "string.prototype.padend": "3.0.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -9887,11 +9887,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "cross-spawn": {
@@ -9900,9 +9900,9 @@
           "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
           "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "lru-cache": "4.1.1",
+            "shebang-command": "1.2.0",
+            "which": "1.3.0"
           }
         },
         "load-json-file": {
@@ -9911,10 +9911,10 @@
           "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "strip-bom": "3.0.0"
           }
         },
         "path-type": {
@@ -9923,7 +9923,7 @@
           "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
           "dev": true,
           "requires": {
-            "pify": "^2.0.0"
+            "pify": "2.3.0"
           }
         },
         "pify": {
@@ -9938,9 +9938,9 @@
           "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
           "dev": true,
           "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
+            "load-json-file": "2.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "2.0.0"
           }
         },
         "strip-bom": {
@@ -9963,7 +9963,7 @@
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
       "requires": {
-        "path-key": "^2.0.0"
+        "path-key": "2.0.1"
       }
     },
     "npmlog": {
@@ -9972,10 +9972,10 @@
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
       "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
+        "are-we-there-yet": "1.1.4",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
       }
     },
     "nth-check": {
@@ -9984,7 +9984,7 @@
       "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
       "dev": true,
       "requires": {
-        "boolbase": "~1.0.0"
+        "boolbase": "1.0.0"
       }
     },
     "null-check": {
@@ -10029,9 +10029,9 @@
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
       "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
+        "copy-descriptor": "0.1.1",
+        "define-property": "0.2.5",
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "define-property": {
@@ -10040,7 +10040,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         }
       }
@@ -10057,7 +10057,7 @@
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.0"
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "isobject": {
@@ -10074,10 +10074,10 @@
       "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "define-properties": "1.1.2",
+        "function-bind": "1.1.1",
+        "has-symbols": "1.0.0",
+        "object-keys": "1.0.11"
       }
     },
     "object.getownpropertydescriptors": {
@@ -10086,8 +10086,8 @@
       "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
+        "define-properties": "1.1.2",
+        "es-abstract": "1.10.0"
       }
     },
     "object.omit": {
@@ -10096,8 +10096,8 @@
       "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
       "dev": true,
       "requires": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
       }
     },
     "object.pick": {
@@ -10106,7 +10106,7 @@
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.1"
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "isobject": {
@@ -10144,7 +10144,7 @@
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
       "requires": {
-        "wrappy": "1"
+        "wrappy": "1.0.2"
       }
     },
     "onecolor": {
@@ -10159,7 +10159,7 @@
       "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==",
       "dev": true,
       "requires": {
-        "is-wsl": "^1.1.0"
+        "is-wsl": "1.1.0"
       }
     },
     "optimist": {
@@ -10168,8 +10168,8 @@
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
       "dev": true,
       "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
+        "minimist": "0.0.8",
+        "wordwrap": "0.0.2"
       }
     },
     "optionator": {
@@ -10178,12 +10178,12 @@
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "dev": true,
       "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
       },
       "dependencies": {
         "wordwrap": {
@@ -10206,7 +10206,7 @@
       "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=",
       "dev": true,
       "requires": {
-        "url-parse": "1.0.x"
+        "url-parse": "1.0.5"
       },
       "dependencies": {
         "url-parse": {
@@ -10215,8 +10215,8 @@
           "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=",
           "dev": true,
           "requires": {
-            "querystringify": "0.0.x",
-            "requires-port": "1.0.x"
+            "querystringify": "0.0.4",
+            "requires-port": "1.0.0"
           }
         }
       }
@@ -10239,7 +10239,7 @@
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "requires": {
-        "lcid": "^1.0.0"
+        "lcid": "1.0.0"
       }
     },
     "os-name": {
@@ -10248,8 +10248,8 @@
       "integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
       "dev": true,
       "requires": {
-        "macos-release": "^1.0.0",
-        "win-release": "^1.0.0"
+        "macos-release": "1.1.0",
+        "win-release": "1.1.1"
       }
     },
     "os-tmpdir": {
@@ -10264,8 +10264,8 @@
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
       }
     },
     "p-finally": {
@@ -10280,7 +10280,7 @@
       "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
       "dev": true,
       "requires": {
-        "p-try": "^1.0.0"
+        "p-try": "1.0.0"
       }
     },
     "p-locate": {
@@ -10289,7 +10289,7 @@
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "p-limit": "^1.1.0"
+        "p-limit": "1.2.0"
       }
     },
     "p-map": {
@@ -10321,9 +10321,9 @@
       "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
       "dev": true,
       "requires": {
-        "cyclist": "~0.2.2",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
+        "cyclist": "0.2.2",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.4"
       }
     },
     "param-case": {
@@ -10332,7 +10332,7 @@
       "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
       "dev": true,
       "requires": {
-        "no-case": "^2.2.0"
+        "no-case": "2.3.2"
       }
     },
     "parse-asn1": {
@@ -10341,11 +10341,11 @@
       "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
       "dev": true,
       "requires": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3"
+        "asn1.js": "4.10.1",
+        "browserify-aes": "1.2.0",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "pbkdf2": "3.0.16"
       }
     },
     "parse-github-repo-url": {
@@ -10360,10 +10360,10 @@
       "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
       "dev": true,
       "requires": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
       }
     },
     "parse-json": {
@@ -10372,7 +10372,7 @@
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "dev": true,
       "requires": {
-        "error-ex": "^1.2.0"
+        "error-ex": "1.3.1"
       }
     },
     "parse-passwd": {
@@ -10387,7 +10387,7 @@
       "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
       "dev": true,
       "requires": {
-        "@types/node": "*"
+        "@types/node": "6.0.90"
       }
     },
     "parsejson": {
@@ -10396,7 +10396,7 @@
       "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseqs": {
@@ -10405,7 +10405,7 @@
       "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseuri": {
@@ -10414,7 +10414,7 @@
       "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseurl": {
@@ -10483,7 +10483,7 @@
       "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
       "dev": true,
       "requires": {
-        "pify": "^3.0.0"
+        "pify": "3.0.0"
       }
     },
     "pause-stream": {
@@ -10492,7 +10492,7 @@
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
       "dev": true,
       "requires": {
-        "through": "~2.3"
+        "through": "2.3.8"
       }
     },
     "pbkdf2": {
@@ -10501,11 +10501,11 @@
       "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
       "dev": true,
       "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.1",
+        "sha.js": "2.4.11"
       }
     },
     "performance-now": {
@@ -10532,7 +10532,7 @@
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
       "requires": {
-        "pinkie": "^2.0.0"
+        "pinkie": "2.0.4"
       }
     },
     "pipetteur": {
@@ -10541,8 +10541,8 @@
       "integrity": "sha1-GVV2CVno0aEcsqUOyD7sRwYz5J8=",
       "dev": true,
       "requires": {
-        "onecolor": "^3.0.4",
-        "synesthesia": "^1.0.1"
+        "onecolor": "3.0.5",
+        "synesthesia": "1.0.1"
       }
     },
     "pkg-dir": {
@@ -10551,7 +10551,7 @@
       "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
       "dev": true,
       "requires": {
-        "find-up": "^2.1.0"
+        "find-up": "2.1.0"
       }
     },
     "plur": {
@@ -10560,7 +10560,7 @@
       "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
       "dev": true,
       "requires": {
-        "irregular-plurals": "^1.0.0"
+        "irregular-plurals": "1.4.0"
       }
     },
     "portfinder": {
@@ -10569,9 +10569,9 @@
       "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=",
       "dev": true,
       "requires": {
-        "async": "^1.5.2",
-        "debug": "^2.2.0",
-        "mkdirp": "0.5.x"
+        "async": "1.5.2",
+        "debug": "2.6.9",
+        "mkdirp": "0.5.1"
       },
       "dependencies": {
         "async": {
@@ -10594,9 +10594,9 @@
       "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
+        "chalk": "2.4.1",
+        "source-map": "0.6.1",
+        "supports-color": "5.4.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -10605,7 +10605,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
@@ -10614,9 +10614,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "color-convert": {
@@ -10625,7 +10625,7 @@
           "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
           "dev": true,
           "requires": {
-            "color-name": "^1.1.1"
+            "color-name": "1.1.3"
           }
         },
         "has-flag": {
@@ -10646,7 +10646,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -10657,10 +10657,10 @@
       "integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==",
       "dev": true,
       "requires": {
-        "postcss": "^6.0.1",
-        "postcss-value-parser": "^3.2.3",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
+        "postcss": "6.0.22",
+        "postcss-value-parser": "3.3.0",
+        "read-cache": "1.0.0",
+        "resolve": "1.5.0"
       }
     },
     "postcss-less": {
@@ -10669,7 +10669,7 @@
       "integrity": "sha1-xjGwicbM5CK5oQ86lY0r7dOBkyQ=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.21"
+        "postcss": "5.2.18"
       },
       "dependencies": {
         "ansi-styles": {
@@ -10684,11 +10684,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           },
           "dependencies": {
             "supports-color": {
@@ -10711,10 +10711,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
+            "chalk": "1.1.3",
+            "js-base64": "2.4.3",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
           }
         },
         "supports-color": {
@@ -10723,7 +10723,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -10734,10 +10734,10 @@
       "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^2.1.0",
-        "object-assign": "^4.1.0",
-        "postcss-load-options": "^1.2.0",
-        "postcss-load-plugins": "^2.3.0"
+        "cosmiconfig": "2.2.2",
+        "object-assign": "4.1.1",
+        "postcss-load-options": "1.2.0",
+        "postcss-load-plugins": "2.3.0"
       }
     },
     "postcss-load-options": {
@@ -10746,8 +10746,8 @@
       "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^2.1.0",
-        "object-assign": "^4.1.0"
+        "cosmiconfig": "2.2.2",
+        "object-assign": "4.1.1"
       }
     },
     "postcss-load-plugins": {
@@ -10756,8 +10756,8 @@
       "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^2.1.1",
-        "object-assign": "^4.1.0"
+        "cosmiconfig": "2.2.2",
+        "object-assign": "4.1.1"
       }
     },
     "postcss-loader": {
@@ -10766,10 +10766,10 @@
       "integrity": "sha512-pV7kB5neJ0/1tZ8L1uGOBNTVBCSCXQoIsZMsrwvO8V2rKGa2tBl/f80GGVxow2jJnRJ2w1ocx693EKhZAb9Isg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^6.0.0",
-        "postcss-load-config": "^1.2.0",
-        "schema-utils": "^0.4.0"
+        "loader-utils": "1.1.0",
+        "postcss": "6.0.22",
+        "postcss-load-config": "1.2.0",
+        "schema-utils": "0.4.5"
       }
     },
     "postcss-media-query-parser": {
@@ -10784,10 +10784,10 @@
       "integrity": "sha1-CeoPN6RExWk4eGBuCbAY6+/3z48=",
       "dev": true,
       "requires": {
-        "chalk": "^1.0.0",
-        "lodash": "^4.1.0",
-        "log-symbols": "^1.0.2",
-        "postcss": "^5.0.0"
+        "chalk": "1.1.3",
+        "lodash": "4.17.5",
+        "log-symbols": "1.0.2",
+        "postcss": "5.2.18"
       },
       "dependencies": {
         "ansi-styles": {
@@ -10802,11 +10802,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "has-flag": {
@@ -10821,10 +10821,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
+            "chalk": "1.1.3",
+            "js-base64": "2.4.3",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
           },
           "dependencies": {
             "supports-color": {
@@ -10833,7 +10833,7 @@
               "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
               "dev": true,
               "requires": {
-                "has-flag": "^1.0.0"
+                "has-flag": "1.0.0"
               }
             }
           }
@@ -10858,7 +10858,7 @@
       "integrity": "sha1-rXcbgfD3L19IRdCKpg+TVXZT1Uw=",
       "dev": true,
       "requires": {
-        "postcss": "^5.2.13"
+        "postcss": "5.2.18"
       },
       "dependencies": {
         "ansi-styles": {
@@ -10873,11 +10873,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           },
           "dependencies": {
             "supports-color": {
@@ -10900,10 +10900,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
+            "chalk": "1.1.3",
+            "js-base64": "2.4.3",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
           }
         },
         "supports-color": {
@@ -10912,7 +10912,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -10923,9 +10923,9 @@
       "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
       "dev": true,
       "requires": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "flatten": "1.0.2",
+        "indexes-of": "1.0.1",
+        "uniq": "1.0.1"
       }
     },
     "postcss-url": {
@@ -10934,11 +10934,11 @@
       "integrity": "sha512-QMV5mA+pCYZQcUEPQkmor9vcPQ2MT+Ipuu8qdi1gVxbNiIiErEGft+eny1ak19qALoBkccS5AHaCaCDzh7b9MA==",
       "dev": true,
       "requires": {
-        "mime": "^1.4.1",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.0",
-        "postcss": "^6.0.1",
-        "xxhashjs": "^0.2.1"
+        "mime": "1.6.0",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "postcss": "6.0.22",
+        "xxhashjs": "0.2.2"
       }
     },
     "postcss-value-parser": {
@@ -10965,8 +10965,8 @@
       "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
       "dev": true,
       "requires": {
-        "renderkid": "^2.0.1",
-        "utila": "~0.4"
+        "renderkid": "2.0.1",
+        "utila": "0.4.0"
       }
     },
     "process": {
@@ -10988,7 +10988,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "asap": "~2.0.3"
+        "asap": "2.0.6"
       }
     },
     "promise-inflight": {
@@ -11003,21 +11003,21 @@
       "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=",
       "dev": true,
       "requires": {
-        "@types/node": "^6.0.46",
-        "@types/q": "^0.0.32",
-        "@types/selenium-webdriver": "~2.53.39",
+        "@types/node": "6.0.90",
+        "@types/q": "0.0.32",
+        "@types/selenium-webdriver": "2.53.43",
         "blocking-proxy": "0.0.5",
-        "chalk": "^1.1.3",
-        "glob": "^7.0.3",
-        "jasmine": "^2.5.3",
-        "jasminewd2": "^2.1.0",
-        "optimist": "~0.6.0",
+        "chalk": "1.1.3",
+        "glob": "7.1.2",
+        "jasmine": "2.99.0",
+        "jasminewd2": "2.2.0",
+        "optimist": "0.6.1",
         "q": "1.4.1",
-        "saucelabs": "~1.3.0",
+        "saucelabs": "1.3.0",
         "selenium-webdriver": "3.0.1",
-        "source-map-support": "~0.4.0",
-        "webdriver-js-extender": "^1.0.0",
-        "webdriver-manager": "^12.0.6"
+        "source-map-support": "0.4.18",
+        "webdriver-js-extender": "1.0.0",
+        "webdriver-manager": "12.0.6"
       },
       "dependencies": {
         "ansi-styles": {
@@ -11032,11 +11032,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "del": {
@@ -11045,13 +11045,13 @@
           "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
           "dev": true,
           "requires": {
-            "globby": "^5.0.0",
-            "is-path-cwd": "^1.0.0",
-            "is-path-in-cwd": "^1.0.0",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "rimraf": "^2.2.8"
+            "globby": "5.0.0",
+            "is-path-cwd": "1.0.0",
+            "is-path-in-cwd": "1.0.0",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1",
+            "rimraf": "2.6.1"
           }
         },
         "globby": {
@@ -11060,12 +11060,12 @@
           "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "arrify": "^1.0.0",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "array-union": "1.0.2",
+            "arrify": "1.0.1",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "minimist": {
@@ -11098,17 +11098,17 @@
           "integrity": "sha1-PfGkgZdwELTL+MnYXHpXeCjA5ws=",
           "dev": true,
           "requires": {
-            "adm-zip": "^0.4.7",
-            "chalk": "^1.1.1",
-            "del": "^2.2.0",
-            "glob": "^7.0.3",
-            "ini": "^1.3.4",
-            "minimist": "^1.2.0",
-            "q": "^1.4.1",
-            "request": "^2.78.0",
-            "rimraf": "^2.5.2",
-            "semver": "^5.3.0",
-            "xml2js": "^0.4.17"
+            "adm-zip": "0.4.7",
+            "chalk": "1.1.3",
+            "del": "2.2.2",
+            "glob": "7.1.2",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "q": "1.4.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.5.0",
+            "xml2js": "0.4.19"
           }
         }
       }
@@ -11119,7 +11119,7 @@
       "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==",
       "dev": true,
       "requires": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.1.2",
         "ipaddr.js": "1.6.0"
       }
     },
@@ -11141,7 +11141,7 @@
       "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=",
       "dev": true,
       "requires": {
-        "event-stream": "~3.3.0"
+        "event-stream": "3.3.4"
       }
     },
     "pseudomap": {
@@ -11156,11 +11156,11 @@
       "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1"
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "parse-asn1": "5.1.1",
+        "randombytes": "2.0.6"
       }
     },
     "pump": {
@@ -11169,8 +11169,8 @@
       "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0"
       }
     },
     "pumpify": {
@@ -11179,9 +11179,9 @@
       "integrity": "sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg==",
       "dev": true,
       "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
+        "duplexify": "3.6.0",
+        "inherits": "2.0.3",
+        "pump": "2.0.1"
       }
     },
     "punycode": {
@@ -11238,8 +11238,8 @@
       "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -11248,7 +11248,7 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -11257,7 +11257,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -11268,7 +11268,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -11279,7 +11279,7 @@
       "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.0"
+        "safe-buffer": "5.1.1"
       }
     },
     "randomfill": {
@@ -11288,8 +11288,8 @@
       "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "dev": true,
       "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
+        "randombytes": "2.0.6",
+        "safe-buffer": "5.1.1"
       }
     },
     "range-parser": {
@@ -11322,7 +11322,7 @@
       "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
       "dev": true,
       "requires": {
-        "pify": "^2.3.0"
+        "pify": "2.3.0"
       },
       "dependencies": {
         "pify": {
@@ -11339,7 +11339,7 @@
       "integrity": "sha1-JezP86FTtoCa+ssj7hU4fbng7mE=",
       "dev": true,
       "requires": {
-        "gather-stream": "^1.0.0"
+        "gather-stream": "1.0.0"
       }
     },
     "read-pkg": {
@@ -11348,9 +11348,9 @@
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
       "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
+        "load-json-file": "1.1.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "1.1.0"
       },
       "dependencies": {
         "path-type": {
@@ -11359,9 +11359,9 @@
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "graceful-fs": "4.1.11",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "pify": {
@@ -11378,8 +11378,8 @@
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
       },
       "dependencies": {
         "find-up": {
@@ -11388,8 +11388,8 @@
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
           "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "path-exists": {
@@ -11398,7 +11398,7 @@
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "pinkie-promise": "2.0.1"
           }
         }
       }
@@ -11409,13 +11409,13 @@
       "integrity": "sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ==",
       "dev": true,
       "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.0.3",
-        "util-deprecate": "~1.0.1"
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "2.0.0",
+        "safe-buffer": "5.1.1",
+        "string_decoder": "1.0.3",
+        "util-deprecate": "1.0.2"
       }
     },
     "readdirp": {
@@ -11424,10 +11424,10 @@
       "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "minimatch": "^3.0.2",
-        "readable-stream": "^2.0.2",
-        "set-immediate-shim": "^1.0.1"
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "readable-stream": "2.3.4",
+        "set-immediate-shim": "1.0.1"
       }
     },
     "rechoir": {
@@ -11436,7 +11436,7 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "resolve": "1.5.0"
       }
     },
     "redent": {
@@ -11445,8 +11445,8 @@
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
       "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
       }
     },
     "reflect-metadata": {
@@ -11473,7 +11473,7 @@
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "^0.1.3"
+        "is-equal-shallow": "0.1.3"
       }
     },
     "regex-not": {
@@ -11482,8 +11482,8 @@
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
+        "extend-shallow": "3.0.2",
+        "safe-regex": "1.1.0"
       }
     },
     "regexpu-core": {
@@ -11492,9 +11492,9 @@
       "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
       "dev": true,
       "requires": {
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
+        "regenerate": "1.3.3",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
       }
     },
     "regjsgen": {
@@ -11509,7 +11509,7 @@
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
       "dev": true,
       "requires": {
-        "jsesc": "~0.5.0"
+        "jsesc": "0.5.0"
       },
       "dependencies": {
         "jsesc": {
@@ -11538,11 +11538,11 @@
       "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=",
       "dev": true,
       "requires": {
-        "css-select": "^1.1.0",
-        "dom-converter": "~0.1",
-        "htmlparser2": "~3.3.0",
-        "strip-ansi": "^3.0.0",
-        "utila": "~0.3"
+        "css-select": "1.2.0",
+        "dom-converter": "0.1.4",
+        "htmlparser2": "3.3.0",
+        "strip-ansi": "3.0.1",
+        "utila": "0.3.3"
       },
       "dependencies": {
         "utila": {
@@ -11571,7 +11571,7 @@
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
-        "is-finite": "^1.0.0"
+        "is-finite": "1.0.2"
       }
     },
     "replace-ext": {
@@ -11586,28 +11586,28 @@
       "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
       "dev": true,
       "requires": {
-        "aws-sign2": "~0.6.0",
-        "aws4": "^1.2.1",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.5",
-        "extend": "~3.0.0",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.1.1",
-        "har-validator": "~4.2.1",
-        "hawk": "~3.1.3",
-        "http-signature": "~1.1.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.7",
-        "oauth-sign": "~0.8.1",
-        "performance-now": "^0.2.0",
-        "qs": "~6.4.0",
-        "safe-buffer": "^5.0.1",
-        "stringstream": "~0.0.4",
-        "tough-cookie": "~2.3.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.0.0"
+        "aws-sign2": "0.6.0",
+        "aws4": "1.6.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.6",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.1.4",
+        "har-validator": "4.2.1",
+        "hawk": "3.1.3",
+        "http-signature": "1.1.1",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.18",
+        "oauth-sign": "0.8.2",
+        "performance-now": "0.2.0",
+        "qs": "6.4.0",
+        "safe-buffer": "5.1.1",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.2.1"
       }
     },
     "require-directory": {
@@ -11640,7 +11640,7 @@
       "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
       "dev": true,
       "requires": {
-        "path-parse": "^1.0.5"
+        "path-parse": "1.0.5"
       }
     },
     "resolve-cwd": {
@@ -11649,7 +11649,7 @@
       "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "3.0.0"
       }
     },
     "resolve-from": {
@@ -11683,7 +11683,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "align-text": "^0.1.1"
+        "align-text": "0.1.4"
       }
     },
     "rimraf": {
@@ -11692,7 +11692,7 @@
       "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.5"
+        "glob": "7.1.2"
       }
     },
     "ripemd160": {
@@ -11701,8 +11701,8 @@
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3"
       }
     },
     "roboto-fontface": {
@@ -11716,7 +11716,7 @@
       "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1"
+        "aproba": "1.2.0"
       }
     },
     "rxjs": {
@@ -11724,7 +11724,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.1.0.tgz",
       "integrity": "sha512-lMZdl6xbHJCSb5lmnb6nOhsoBVCyoDC5LDJQK9WWyq+tsI7KnlDIZ0r0AZAlBpRPLbwQA9kzSBAZwNIZEZ+hcw==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.0"
       }
     },
     "rxjs-compat": {
@@ -11744,7 +11744,7 @@
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
-        "ret": "~0.1.10"
+        "ret": "0.1.15"
       }
     },
     "safefs": {
@@ -11753,8 +11753,8 @@
       "integrity": "sha1-+CrrS9165R9lPrIPZyizBYyNZEU=",
       "dev": true,
       "requires": {
-        "editions": "^1.1.1",
-        "graceful-fs": "^4.1.4"
+        "editions": "1.3.4",
+        "graceful-fs": "4.1.11"
       }
     },
     "sass-graph": {
@@ -11763,10 +11763,10 @@
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^7.0.0"
+        "glob": "7.1.2",
+        "lodash": "4.17.5",
+        "scss-tokenizer": "0.2.3",
+        "yargs": "7.1.0"
       }
     },
     "sass-loader": {
@@ -11775,11 +11775,11 @@
       "integrity": "sha512-MeVVJFejJELlAbA7jrRchi88PGP6U9yIfqyiG+bBC4a9s2PX+ulJB9h8bbEohtPBfZmlLhNZ0opQM9hovRXvlw==",
       "dev": true,
       "requires": {
-        "clone-deep": "^2.0.1",
-        "loader-utils": "^1.0.1",
-        "lodash.tail": "^4.1.1",
-        "neo-async": "^2.5.0",
-        "pify": "^3.0.0"
+        "clone-deep": "2.0.2",
+        "loader-utils": "1.1.0",
+        "lodash.tail": "4.1.1",
+        "neo-async": "2.5.1",
+        "pify": "3.0.0"
       }
     },
     "saucelabs": {
@@ -11788,7 +11788,7 @@
       "integrity": "sha1-0kDoAJ33+ocwbsRXimm6O1xCT+4=",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "^1.0.0"
+        "https-proxy-agent": "1.0.0"
       }
     },
     "sax": {
@@ -11803,9 +11803,9 @@
       "integrity": "sha1-bOA/VKCQtmjjy+2/IO354xBZPnI=",
       "dev": true,
       "requires": {
-        "ignorefs": "^1.0.0",
-        "safefs": "^3.1.2",
-        "taskgroup": "^4.0.5"
+        "ignorefs": "1.2.0",
+        "safefs": "3.2.2",
+        "taskgroup": "4.3.1"
       },
       "dependencies": {
         "safefs": {
@@ -11814,7 +11814,7 @@
           "integrity": "sha1-gXDBRE1wOOCMrqBaN0+uL6NJ4Vw=",
           "dev": true,
           "requires": {
-            "graceful-fs": "*"
+            "graceful-fs": "4.1.11"
           }
         },
         "taskgroup": {
@@ -11823,8 +11823,8 @@
           "integrity": "sha1-feGT/r12gnPEV3MElwJNUSwnkVo=",
           "dev": true,
           "requires": {
-            "ambi": "^2.2.0",
-            "csextends": "^1.0.3"
+            "ambi": "2.5.0",
+            "csextends": "1.1.1"
           }
         }
       }
@@ -11835,8 +11835,8 @@
       "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
       "dev": true,
       "requires": {
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0"
+        "ajv": "6.1.1",
+        "ajv-keywords": "3.1.0"
       }
     },
     "scss-tokenizer": {
@@ -11845,8 +11845,8 @@
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
+        "js-base64": "2.4.3",
+        "source-map": "0.4.4"
       },
       "dependencies": {
         "source-map": {
@@ -11855,7 +11855,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -11872,10 +11872,10 @@
       "integrity": "sha1-ot6l2kqX9mcuiefKcnbO+jZRR6c=",
       "dev": true,
       "requires": {
-        "adm-zip": "^0.4.7",
-        "rimraf": "^2.5.4",
+        "adm-zip": "0.4.7",
+        "rimraf": "2.6.1",
         "tmp": "0.0.30",
-        "xml2js": "^0.4.17"
+        "xml2js": "0.4.19"
       },
       "dependencies": {
         "tmp": {
@@ -11884,7 +11884,7 @@
           "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
           "dev": true,
           "requires": {
-            "os-tmpdir": "~1.0.1"
+            "os-tmpdir": "1.0.2"
           }
         }
       }
@@ -11910,7 +11910,7 @@
       "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
       "dev": true,
       "requires": {
-        "semver": "^5.3.0"
+        "semver": "5.5.0"
       }
     },
     "semver-intersect": {
@@ -11919,7 +11919,7 @@
       "integrity": "sha1-j6hKnhAovSOeRTDRo+GB5pjYhLo=",
       "dev": true,
       "requires": {
-        "semver": "^5.0.0"
+        "semver": "5.5.0"
       }
     },
     "send": {
@@ -11929,18 +11929,18 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
+        "depd": "1.1.2",
+        "destroy": "1.0.4",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
+        "http-errors": "1.6.2",
         "mime": "1.4.1",
         "ms": "2.0.0",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
+        "on-finished": "2.3.0",
+        "range-parser": "1.2.0",
+        "statuses": "1.4.0"
       },
       "dependencies": {
         "mime": {
@@ -11969,13 +11969,13 @@
       "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
+        "accepts": "1.3.4",
         "batch": "0.6.1",
         "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
+        "escape-html": "1.0.3",
+        "http-errors": "1.6.2",
+        "mime-types": "2.1.18",
+        "parseurl": "1.3.2"
       }
     },
     "serve-static": {
@@ -11984,9 +11984,9 @@
       "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
       "dev": true,
       "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.2",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "parseurl": "1.3.2",
         "send": "0.16.2"
       }
     },
@@ -12008,10 +12008,10 @@
       "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
+        "extend-shallow": "2.0.1",
+        "is-extendable": "0.1.1",
+        "is-plain-object": "2.0.4",
+        "split-string": "3.1.0"
       },
       "dependencies": {
         "extend-shallow": {
@@ -12020,7 +12020,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -12043,8 +12043,8 @@
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
       }
     },
     "shallow-clone": {
@@ -12053,9 +12053,9 @@
       "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
       "dev": true,
       "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^5.0.0",
-        "mixin-object": "^2.0.1"
+        "is-extendable": "0.1.1",
+        "kind-of": "5.1.0",
+        "mixin-object": "2.0.1"
       },
       "dependencies": {
         "kind-of": {
@@ -12072,7 +12072,7 @@
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "requires": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "1.0.0"
       }
     },
     "shebang-regex": {
@@ -12087,10 +12087,10 @@
       "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
       "dev": true,
       "requires": {
-        "array-filter": "~0.0.0",
-        "array-map": "~0.0.0",
-        "array-reduce": "~0.0.0",
-        "jsonify": "~0.0.0"
+        "array-filter": "0.0.1",
+        "array-map": "0.0.0",
+        "array-reduce": "0.0.0",
+        "jsonify": "0.0.0"
       }
     },
     "shelljs": {
@@ -12099,9 +12099,9 @@
       "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
+        "glob": "7.1.2",
+        "interpret": "1.1.0",
+        "rechoir": "0.6.2"
       }
     },
     "signal-exit": {
@@ -12116,7 +12116,7 @@
       "integrity": "sha1-IglwbxyFCp8dENDYQJGLRvJuG8k=",
       "dev": true,
       "requires": {
-        "debug": "^2.2.0"
+        "debug": "2.6.9"
       }
     },
     "slash": {
@@ -12131,7 +12131,7 @@
       "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
       "dev": true,
       "requires": {
-        "is-fullwidth-code-point": "^2.0.0"
+        "is-fullwidth-code-point": "2.0.0"
       },
       "dependencies": {
         "is-fullwidth-code-point": {
@@ -12154,14 +12154,14 @@
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
+        "base": "0.11.2",
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "map-cache": "0.2.2",
+        "source-map": "0.5.7",
+        "source-map-resolve": "0.5.1",
+        "use": "3.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -12170,7 +12170,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "extend-shallow": {
@@ -12179,7 +12179,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -12190,9 +12190,9 @@
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "snapdragon-util": "3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -12201,7 +12201,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "is-accessor-descriptor": {
@@ -12210,7 +12210,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -12219,7 +12219,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -12228,9 +12228,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         },
         "isobject": {
@@ -12253,7 +12253,7 @@
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.2.0"
+        "kind-of": "3.2.2"
       }
     },
     "sntp": {
@@ -12262,7 +12262,7 @@
       "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
       "dev": true,
       "requires": {
-        "hoek": "2.x.x"
+        "hoek": "2.16.3"
       }
     },
     "socicon": {
@@ -12418,8 +12418,8 @@
       "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
       "dev": true,
       "requires": {
-        "faye-websocket": "^0.10.0",
-        "uuid": "^3.0.1"
+        "faye-websocket": "0.10.0",
+        "uuid": "3.2.1"
       }
     },
     "sockjs-client": {
@@ -12428,12 +12428,12 @@
       "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
       "dev": true,
       "requires": {
-        "debug": "^2.6.6",
+        "debug": "2.6.9",
         "eventsource": "0.1.6",
-        "faye-websocket": "~0.11.0",
-        "inherits": "^2.0.1",
-        "json3": "^3.3.2",
-        "url-parse": "^1.1.8"
+        "faye-websocket": "0.11.1",
+        "inherits": "2.0.3",
+        "json3": "3.3.2",
+        "url-parse": "1.4.0"
       },
       "dependencies": {
         "faye-websocket": {
@@ -12442,7 +12442,7 @@
           "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
           "dev": true,
           "requires": {
-            "websocket-driver": ">=0.5.1"
+            "websocket-driver": "0.7.0"
           }
         }
       }
@@ -12465,11 +12465,11 @@
       "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==",
       "dev": true,
       "requires": {
-        "atob": "^2.0.0",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
+        "atob": "2.1.1",
+        "decode-uri-component": "0.2.0",
+        "resolve-url": "0.2.1",
+        "source-map-url": "0.4.0",
+        "urix": "0.1.0"
       }
     },
     "source-map-support": {
@@ -12478,7 +12478,7 @@
       "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "dev": true,
       "requires": {
-        "source-map": "^0.5.6"
+        "source-map": "0.5.7"
       }
     },
     "source-map-url": {
@@ -12499,7 +12499,7 @@
       "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
       "dev": true,
       "requires": {
-        "spdx-license-ids": "^1.0.2"
+        "spdx-license-ids": "1.2.2"
       }
     },
     "spdx-expression-parse": {
@@ -12520,12 +12520,12 @@
       "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
       "dev": true,
       "requires": {
-        "debug": "^2.6.8",
-        "handle-thing": "^1.2.5",
-        "http-deceiver": "^1.2.7",
-        "safe-buffer": "^5.0.1",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^2.0.18"
+        "debug": "2.6.9",
+        "handle-thing": "1.2.5",
+        "http-deceiver": "1.2.7",
+        "safe-buffer": "5.1.1",
+        "select-hose": "2.0.0",
+        "spdy-transport": "2.1.0"
       }
     },
     "spdy-transport": {
@@ -12534,13 +12534,13 @@
       "integrity": "sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==",
       "dev": true,
       "requires": {
-        "debug": "^2.6.8",
-        "detect-node": "^2.0.3",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.1",
-        "readable-stream": "^2.2.9",
-        "safe-buffer": "^5.0.1",
-        "wbuf": "^1.7.2"
+        "debug": "2.6.9",
+        "detect-node": "2.0.3",
+        "hpack.js": "2.1.6",
+        "obuf": "1.1.2",
+        "readable-stream": "2.3.4",
+        "safe-buffer": "5.1.1",
+        "wbuf": "1.7.3"
       }
     },
     "specificity": {
@@ -12555,7 +12555,7 @@
       "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
       "dev": true,
       "requires": {
-        "through": "2"
+        "through": "2.3.8"
       }
     },
     "split-string": {
@@ -12564,7 +12564,7 @@
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^3.0.0"
+        "extend-shallow": "3.0.2"
       }
     },
     "split2": {
@@ -12573,7 +12573,7 @@
       "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
       "dev": true,
       "requires": {
-        "through2": "^2.0.2"
+        "through2": "2.0.3"
       }
     },
     "sprintf-js": {
@@ -12588,14 +12588,14 @@
       "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
       "dev": true,
       "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "tweetnacl": "~0.14.0"
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
       },
       "dependencies": {
         "assert-plus": {
@@ -12612,7 +12612,7 @@
       "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.1"
+        "safe-buffer": "5.1.1"
       }
     },
     "static-extend": {
@@ -12621,8 +12621,8 @@
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
+        "define-property": "0.2.5",
+        "object-copy": "0.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -12631,7 +12631,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         }
       }
@@ -12642,7 +12642,7 @@
       "integrity": "sha1-LFlJtTHgf4eojm6k3PrFOqjHWis=",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.4"
+        "lodash": "4.17.5"
       }
     },
     "statuses": {
@@ -12657,7 +12657,7 @@
       "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.1"
+        "readable-stream": "2.3.4"
       }
     },
     "stream-browserify": {
@@ -12666,8 +12666,8 @@
       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.4"
       }
     },
     "stream-combiner": {
@@ -12676,7 +12676,7 @@
       "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
       "dev": true,
       "requires": {
-        "duplexer": "~0.1.1"
+        "duplexer": "0.1.1"
       }
     },
     "stream-each": {
@@ -12685,8 +12685,8 @@
       "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
+        "end-of-stream": "1.4.1",
+        "stream-shift": "1.0.0"
       }
     },
     "stream-http": {
@@ -12695,11 +12695,11 @@
       "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
+        "builtin-status-codes": "3.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "to-arraybuffer": "1.0.1",
+        "xtend": "4.0.1"
       },
       "dependencies": {
         "readable-stream": {
@@ -12708,13 +12708,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -12723,7 +12723,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -12740,9 +12740,9 @@
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "dev": true,
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
       }
     },
     "string.prototype.padend": {
@@ -12751,9 +12751,9 @@
       "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.4.3",
-        "function-bind": "^1.0.2"
+        "define-properties": "1.1.2",
+        "es-abstract": "1.10.0",
+        "function-bind": "1.1.1"
       }
     },
     "string_decoder": {
@@ -12762,7 +12762,7 @@
       "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "5.1.1"
       }
     },
     "stringstream": {
@@ -12777,7 +12777,7 @@
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       }
     },
     "strip-bom": {
@@ -12786,7 +12786,7 @@
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "requires": {
-        "is-utf8": "^0.2.0"
+        "is-utf8": "0.2.1"
       }
     },
     "strip-eof": {
@@ -12801,7 +12801,7 @@
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "dev": true,
       "requires": {
-        "get-stdin": "^4.0.1"
+        "get-stdin": "4.0.1"
       }
     },
     "strip-json-comments": {
@@ -12816,8 +12816,8 @@
       "integrity": "sha512-T+UNsAcl3Yg+BsPKs1vd22Fr8sVT+CJMtzqc6LEw9bbJZb43lm9GoeIfUcDEefBSWC0BhYbcdupV1GtI4DGzxg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^0.4.5"
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.4.5"
       }
     },
     "style-search": {
@@ -12832,16 +12832,16 @@
       "integrity": "sha1-ZMg+BDimjJ7fRJ6MVSp9mrYAmws=",
       "dev": true,
       "requires": {
-        "browserslist": "^1.1.3",
-        "chalk": "^1.1.1",
-        "log-symbols": "^1.0.2",
-        "minimist": "^1.2.0",
-        "plur": "^2.1.2",
-        "postcss": "^5.0.18",
-        "postcss-reporter": "^1.3.3",
-        "postcss-selector-parser": "^2.0.0",
-        "read-file-stdin": "^0.2.1",
-        "text-table": "^0.2.0",
+        "browserslist": "1.7.7",
+        "chalk": "1.1.3",
+        "log-symbols": "1.0.2",
+        "minimist": "1.2.0",
+        "plur": "2.1.2",
+        "postcss": "5.2.18",
+        "postcss-reporter": "1.4.1",
+        "postcss-selector-parser": "2.2.3",
+        "read-file-stdin": "0.2.1",
+        "text-table": "0.2.0",
         "write-file-stdout": "0.0.2"
       },
       "dependencies": {
@@ -12857,8 +12857,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "^1.0.30000639",
-            "electron-to-chromium": "^1.2.7"
+            "caniuse-db": "1.0.30000810",
+            "electron-to-chromium": "1.3.34"
           }
         },
         "chalk": {
@@ -12867,11 +12867,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "has-flag": {
@@ -12892,10 +12892,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
+            "chalk": "1.1.3",
+            "js-base64": "2.4.3",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
           },
           "dependencies": {
             "supports-color": {
@@ -12904,7 +12904,7 @@
               "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
               "dev": true,
               "requires": {
-                "has-flag": "^1.0.0"
+                "has-flag": "1.0.0"
               }
             }
           }
@@ -12915,10 +12915,10 @@
           "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
           "dev": true,
           "requires": {
-            "chalk": "^1.0.0",
-            "lodash": "^4.1.0",
-            "log-symbols": "^1.0.2",
-            "postcss": "^5.0.0"
+            "chalk": "1.1.3",
+            "lodash": "4.17.5",
+            "log-symbols": "1.0.2",
+            "postcss": "5.2.18"
           }
         },
         "supports-color": {
@@ -12935,45 +12935,45 @@
       "integrity": "sha1-ER+Xttpy53XICADWu29fhpmXeF0=",
       "dev": true,
       "requires": {
-        "autoprefixer": "^6.0.0",
-        "balanced-match": "^0.4.0",
-        "chalk": "^2.0.1",
-        "colorguard": "^1.2.0",
-        "cosmiconfig": "^2.1.1",
-        "debug": "^2.6.0",
-        "doiuse": "^2.4.1",
-        "execall": "^1.0.0",
-        "file-entry-cache": "^2.0.0",
-        "get-stdin": "^5.0.0",
-        "globby": "^6.0.0",
-        "globjoin": "^0.1.4",
-        "html-tags": "^2.0.0",
-        "ignore": "^3.2.0",
-        "imurmurhash": "^0.1.4",
-        "known-css-properties": "^0.2.0",
-        "lodash": "^4.17.4",
-        "log-symbols": "^1.0.2",
-        "mathml-tag-names": "^2.0.0",
-        "meow": "^3.3.0",
-        "micromatch": "^2.3.11",
-        "normalize-selector": "^0.2.0",
-        "pify": "^2.3.0",
-        "postcss": "^5.0.20",
-        "postcss-less": "^0.14.0",
-        "postcss-media-query-parser": "^0.2.0",
-        "postcss-reporter": "^3.0.0",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-scss": "^0.4.0",
-        "postcss-selector-parser": "^2.1.1",
-        "postcss-value-parser": "^3.1.1",
-        "resolve-from": "^3.0.0",
-        "specificity": "^0.3.0",
-        "string-width": "^2.0.0",
-        "style-search": "^0.1.0",
-        "stylehacks": "^2.3.2",
-        "sugarss": "^0.2.0",
-        "svg-tags": "^1.0.0",
-        "table": "^4.0.1"
+        "autoprefixer": "6.7.7",
+        "balanced-match": "0.4.2",
+        "chalk": "2.2.2",
+        "colorguard": "1.2.1",
+        "cosmiconfig": "2.2.2",
+        "debug": "2.6.9",
+        "doiuse": "2.6.0",
+        "execall": "1.0.0",
+        "file-entry-cache": "2.0.0",
+        "get-stdin": "5.0.1",
+        "globby": "6.1.0",
+        "globjoin": "0.1.4",
+        "html-tags": "2.0.0",
+        "ignore": "3.3.7",
+        "imurmurhash": "0.1.4",
+        "known-css-properties": "0.2.0",
+        "lodash": "4.17.5",
+        "log-symbols": "1.0.2",
+        "mathml-tag-names": "2.0.1",
+        "meow": "3.7.0",
+        "micromatch": "2.3.11",
+        "normalize-selector": "0.2.0",
+        "pify": "2.3.0",
+        "postcss": "5.2.18",
+        "postcss-less": "0.14.0",
+        "postcss-media-query-parser": "0.2.3",
+        "postcss-reporter": "3.0.0",
+        "postcss-resolve-nested-selector": "0.1.1",
+        "postcss-scss": "0.4.1",
+        "postcss-selector-parser": "2.2.3",
+        "postcss-value-parser": "3.3.0",
+        "resolve-from": "3.0.0",
+        "specificity": "0.3.2",
+        "string-width": "2.1.1",
+        "style-search": "0.1.0",
+        "stylehacks": "2.3.2",
+        "sugarss": "0.2.0",
+        "svg-tags": "1.0.0",
+        "table": "4.0.3"
       },
       "dependencies": {
         "ansi-regex": {
@@ -12994,12 +12994,12 @@
           "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
           "dev": true,
           "requires": {
-            "browserslist": "^1.7.6",
-            "caniuse-db": "^1.0.30000634",
-            "normalize-range": "^0.1.2",
-            "num2fraction": "^1.2.2",
-            "postcss": "^5.2.16",
-            "postcss-value-parser": "^3.2.3"
+            "browserslist": "1.7.7",
+            "caniuse-db": "1.0.30000810",
+            "normalize-range": "0.1.2",
+            "num2fraction": "1.2.2",
+            "postcss": "5.2.18",
+            "postcss-value-parser": "3.3.0"
           }
         },
         "balanced-match": {
@@ -13014,8 +13014,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "^1.0.30000639",
-            "electron-to-chromium": "^1.2.7"
+            "caniuse-db": "1.0.30000810",
+            "electron-to-chromium": "1.3.34"
           }
         },
         "get-stdin": {
@@ -13030,11 +13030,11 @@
           "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "has-flag": {
@@ -13061,10 +13061,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
+            "chalk": "1.1.3",
+            "js-base64": "2.4.3",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
           },
           "dependencies": {
             "chalk": {
@@ -13073,11 +13073,11 @@
               "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
               "dev": true,
               "requires": {
-                "ansi-styles": "^2.2.1",
-                "escape-string-regexp": "^1.0.2",
-                "has-ansi": "^2.0.0",
-                "strip-ansi": "^3.0.0",
-                "supports-color": "^2.0.0"
+                "ansi-styles": "2.2.1",
+                "escape-string-regexp": "1.0.5",
+                "has-ansi": "2.0.0",
+                "strip-ansi": "3.0.1",
+                "supports-color": "2.0.0"
               },
               "dependencies": {
                 "supports-color": {
@@ -13096,8 +13096,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
           },
           "dependencies": {
             "strip-ansi": {
@@ -13106,7 +13106,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -13117,7 +13117,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -13128,12 +13128,12 @@
       "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
       "dev": true,
       "requires": {
-        "css-parse": "1.7.x",
-        "debug": "*",
-        "glob": "7.0.x",
-        "mkdirp": "0.5.x",
-        "sax": "0.5.x",
-        "source-map": "0.1.x"
+        "css-parse": "1.7.0",
+        "debug": "2.6.9",
+        "glob": "7.0.6",
+        "mkdirp": "0.5.1",
+        "sax": "0.5.8",
+        "source-map": "0.1.43"
       },
       "dependencies": {
         "glob": {
@@ -13142,12 +13142,12 @@
           "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.2",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "source-map": {
@@ -13156,7 +13156,7 @@
           "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -13167,9 +13167,9 @@
       "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "when": "~3.6.x"
+        "loader-utils": "1.1.0",
+        "lodash.clonedeep": "4.5.0",
+        "when": "3.6.4"
       }
     },
     "sugarss": {
@@ -13178,7 +13178,7 @@
       "integrity": "sha1-rDQjdWMyfG/4l7ZHQr9q7BkK054=",
       "dev": true,
       "requires": {
-        "postcss": "^5.2.4"
+        "postcss": "5.2.18"
       },
       "dependencies": {
         "ansi-styles": {
@@ -13193,11 +13193,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           },
           "dependencies": {
             "supports-color": {
@@ -13220,10 +13220,10 @@
           "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
+            "chalk": "1.1.3",
+            "js-base64": "2.4.3",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
           }
         },
         "supports-color": {
@@ -13232,7 +13232,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -13243,7 +13243,7 @@
       "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
       "dev": true,
       "requires": {
-        "has-flag": "^2.0.0"
+        "has-flag": "2.0.0"
       }
     },
     "svg-tags": {
@@ -13273,12 +13273,12 @@
       "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==",
       "dev": true,
       "requires": {
-        "ajv": "^6.0.1",
-        "ajv-keywords": "^3.0.0",
-        "chalk": "^2.1.0",
-        "lodash": "^4.17.4",
+        "ajv": "6.1.1",
+        "ajv-keywords": "3.1.0",
+        "chalk": "2.2.2",
+        "lodash": "4.17.5",
         "slice-ansi": "1.0.0",
-        "string-width": "^2.1.1"
+        "string-width": "2.1.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -13299,8 +13299,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
           }
         },
         "strip-ansi": {
@@ -13309,7 +13309,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         }
       }
@@ -13326,9 +13326,9 @@
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "dev": true,
       "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.2",
-        "inherits": "2"
+        "block-stream": "0.0.9",
+        "fstream": "1.0.11",
+        "inherits": "2.0.3"
       }
     },
     "taskgroup": {
@@ -13337,10 +13337,10 @@
       "integrity": "sha1-CHNsmyRoOxQ0d0Ix60tzqnw/ebU=",
       "dev": true,
       "requires": {
-        "ambi": "^2.5.0",
-        "eachr": "^3.2.0",
-        "editions": "^1.1.1",
-        "extendr": "^3.2.0"
+        "ambi": "2.5.0",
+        "eachr": "3.2.0",
+        "editions": "1.3.4",
+        "extendr": "3.3.0"
       }
     },
     "tempfile": {
@@ -13349,8 +13349,8 @@
       "integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=",
       "dev": true,
       "requires": {
-        "os-tmpdir": "^1.0.0",
-        "uuid": "^2.0.1"
+        "os-tmpdir": "1.0.2",
+        "uuid": "2.0.3"
       },
       "dependencies": {
         "uuid": {
@@ -13385,8 +13385,8 @@
       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.1.5",
-        "xtend": "~4.0.1"
+        "readable-stream": "2.3.4",
+        "xtend": "4.0.1"
       }
     },
     "thunky": {
@@ -13401,7 +13401,7 @@
       "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
       "dev": true,
       "requires": {
-        "setimmediate": "^1.0.4"
+        "setimmediate": "1.0.5"
       }
     },
     "tinymce": {
@@ -13415,7 +13415,7 @@
       "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
       "dev": true,
       "requires": {
-        "os-tmpdir": "~1.0.1"
+        "os-tmpdir": "1.0.2"
       }
     },
     "to-array": {
@@ -13442,7 +13442,7 @@
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       }
     },
     "to-regex": {
@@ -13451,10 +13451,10 @@
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "regex-not": "1.0.2",
+        "safe-regex": "1.1.0"
       }
     },
     "to-regex-range": {
@@ -13463,8 +13463,8 @@
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1"
       },
       "dependencies": {
         "is-number": {
@@ -13473,7 +13473,7 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           }
         }
       }
@@ -13490,7 +13490,7 @@
       "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
       "dev": true,
       "requires": {
-        "punycode": "^1.4.1"
+        "punycode": "1.4.1"
       }
     },
     "tree-kill": {
@@ -13523,7 +13523,7 @@
       "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
       "dev": true,
       "requires": {
-        "glob": "^6.0.4"
+        "glob": "6.0.4"
       },
       "dependencies": {
         "glob": {
@@ -13532,11 +13532,11 @@
           "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
           "dev": true,
           "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         }
       }
@@ -13547,16 +13547,16 @@
       "integrity": "sha1-u9KOOK9Kqj6WB2xGbhsiAZfBo84=",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.0",
-        "chalk": "^2.0.0",
-        "diff": "^3.1.0",
-        "make-error": "^1.1.1",
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.4.0",
-        "tsconfig": "^6.0.0",
-        "v8flags": "^3.0.0",
-        "yn": "^2.0.0"
+        "arrify": "1.0.1",
+        "chalk": "2.2.2",
+        "diff": "3.4.0",
+        "make-error": "1.3.4",
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.18",
+        "tsconfig": "6.0.0",
+        "v8flags": "3.0.1",
+        "yn": "2.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -13573,8 +13573,8 @@
       "integrity": "sha1-aw6DdgA9evGGT434+J3QBZ/80DI=",
       "dev": true,
       "requires": {
-        "strip-bom": "^3.0.0",
-        "strip-json-comments": "^2.0.0"
+        "strip-bom": "3.0.0",
+        "strip-json-comments": "2.0.1"
       },
       "dependencies": {
         "strip-bom": {
@@ -13591,10 +13591,10 @@
       "integrity": "sha512-NP+CjM1EXza/M8mOXBLH3vkFEJiu1zfEAlC5WdJxHPn8l96QPz5eooP6uAgYtw1CcKfuSyIiheNUdKxtDWCNeg==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "source-map": "^0.6.0",
-        "source-map-support": "^0.5.0"
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "source-map": "0.6.1",
+        "source-map-support": "0.5.5"
       },
       "dependencies": {
         "minimist": {
@@ -13615,8 +13615,8 @@
           "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==",
           "dev": true,
           "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
+            "buffer-from": "1.0.0",
+            "source-map": "0.6.1"
           }
         }
       }
@@ -13632,16 +13632,16 @@
       "integrity": "sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.22.0",
-        "colors": "^1.1.2",
-        "commander": "^2.9.0",
-        "diff": "^3.2.0",
-        "glob": "^7.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.7.1",
-        "tsutils": "^2.8.1"
+        "babel-code-frame": "6.26.0",
+        "colors": "1.1.2",
+        "commander": "2.14.1",
+        "diff": "3.4.0",
+        "glob": "7.1.2",
+        "minimatch": "3.0.4",
+        "resolve": "1.5.0",
+        "semver": "5.5.0",
+        "tslib": "1.9.0",
+        "tsutils": "2.21.2"
       }
     },
     "tslint-language-service": {
@@ -13656,7 +13656,7 @@
       "integrity": "sha512-iaIuyjIUeFLdD39MYdzqBuY7Zv6+uGxSwRH4mf+HuzsnznjFz0R2tGrAe0/JvtNh91WrN8UN/DZRFTZNDuVekA==",
       "dev": true,
       "requires": {
-        "tslib": "^1.8.1"
+        "tslib": "1.9.0"
       }
     },
     "tty-browserify": {
@@ -13671,7 +13671,7 @@
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.0.1"
+        "safe-buffer": "5.1.1"
       }
     },
     "tweetnacl": {
@@ -13687,7 +13687,7 @@
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "1.1.2"
       }
     },
     "type-is": {
@@ -13697,7 +13697,7 @@
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "~2.1.18"
+        "mime-types": "2.1.18"
       }
     },
     "typechecker": {
@@ -13706,7 +13706,7 @@
       "integrity": "sha512-bqPE/ck3bVIaXP7gMKTKSHrypT32lpYTpiqzPYeYzdSQnmaGvaGhy7TnN/M/+5R+2rs/kKcp9ZLPRp/Q9Yj+4w==",
       "dev": true,
       "requires": {
-        "editions": "^1.3.4"
+        "editions": "1.3.4"
       }
     },
     "typedarray": {
@@ -13732,8 +13732,8 @@
       "integrity": "sha512-hS7+TDiqIqvWScCcKRybCQzmMnEzJ4ryl9ErRmW4GFyG48p0/dKZiy/5mVLbsFzU8CCnCgQdxMiJzZythvLzCg==",
       "dev": true,
       "requires": {
-        "commander": "~2.15.0",
-        "source-map": "~0.6.1"
+        "commander": "2.15.1",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "commander": {
@@ -13763,14 +13763,14 @@
       "integrity": "sha512-hIQJ1yxAPhEA2yW/i7Fr+SXZVMp+VEI3d42RTHBgQd2yhp/1UdBcR3QEWPV5ahBxlqQDMEMTuTEvDHSFINfwSw==",
       "dev": true,
       "requires": {
-        "cacache": "^10.0.4",
-        "find-cache-dir": "^1.0.0",
-        "schema-utils": "^0.4.5",
-        "serialize-javascript": "^1.4.0",
-        "source-map": "^0.6.1",
-        "uglify-es": "^3.3.4",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
+        "cacache": "10.0.4",
+        "find-cache-dir": "1.0.0",
+        "schema-utils": "0.4.5",
+        "serialize-javascript": "1.5.0",
+        "source-map": "0.6.1",
+        "uglify-es": "3.3.9",
+        "webpack-sources": "1.1.0",
+        "worker-farm": "1.6.0"
       },
       "dependencies": {
         "commander": {
@@ -13791,8 +13791,8 @@
           "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
           "dev": true,
           "requires": {
-            "commander": "~2.13.0",
-            "source-map": "~0.6.1"
+            "commander": "2.13.0",
+            "source-map": "0.6.1"
           }
         }
       }
@@ -13809,10 +13809,10 @@
       "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
+        "arr-union": "3.1.0",
+        "get-value": "2.0.6",
+        "is-extendable": "0.1.1",
+        "set-value": "0.4.3"
       },
       "dependencies": {
         "extend-shallow": {
@@ -13821,7 +13821,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         },
         "set-value": {
@@ -13830,10 +13830,10 @@
           "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
+            "extend-shallow": "2.0.1",
+            "is-extendable": "0.1.1",
+            "is-plain-object": "2.0.4",
+            "to-object-path": "0.3.0"
           }
         }
       }
@@ -13850,7 +13850,7 @@
       "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
       "dev": true,
       "requires": {
-        "unique-slug": "^2.0.0"
+        "unique-slug": "2.0.0"
       }
     },
     "unique-slug": {
@@ -13859,7 +13859,7 @@
       "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
       "dev": true,
       "requires": {
-        "imurmurhash": "^0.1.4"
+        "imurmurhash": "0.1.4"
       }
     },
     "universalify": {
@@ -13886,8 +13886,8 @@
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
       "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
+        "has-value": "0.3.1",
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "has-value": {
@@ -13896,9 +13896,9 @@
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "dev": true,
           "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
+            "get-value": "2.0.6",
+            "has-values": "0.1.4",
+            "isobject": "2.1.0"
           },
           "dependencies": {
             "isobject": {
@@ -13944,7 +13944,7 @@
       "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=",
       "dev": true,
       "requires": {
-        "punycode": "^2.1.0"
+        "punycode": "2.1.0"
       },
       "dependencies": {
         "punycode": {
@@ -13991,9 +13991,9 @@
       "integrity": "sha512-rAonpHy7231fmweBKUFe0bYnlGDty77E+fm53NZdij7j/YOpyGzc7ttqG1nAXl3aRs0k41o0PC3TvGXQiw2Zvw==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "mime": "^2.0.3",
-        "schema-utils": "^0.4.3"
+        "loader-utils": "1.1.0",
+        "mime": "2.3.1",
+        "schema-utils": "0.4.5"
       },
       "dependencies": {
         "mime": {
@@ -14010,8 +14010,8 @@
       "integrity": "sha512-ERuGxDiQ6Xw/agN4tuoCRbmwRuZP0cJ1lJxJubXr5Q/5cDa78+Dc4wfvtxzhzhkm5VvmW6Mf8EVj9SPGN4l8Lg==",
       "dev": true,
       "requires": {
-        "querystringify": "^2.0.0",
-        "requires-port": "^1.0.0"
+        "querystringify": "2.0.0",
+        "requires-port": "1.0.0"
       },
       "dependencies": {
         "querystringify": {
@@ -14028,7 +14028,7 @@
       "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.2"
+        "kind-of": "6.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -14045,8 +14045,8 @@
       "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.x",
-        "tmp": "0.0.x"
+        "lru-cache": "4.1.1",
+        "tmp": "0.0.31"
       }
     },
     "util": {
@@ -14078,8 +14078,8 @@
       "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
+        "define-properties": "1.1.2",
+        "object.getownpropertydescriptors": "2.0.3"
       }
     },
     "utila": {
@@ -14106,7 +14106,7 @@
       "integrity": "sha1-3Oj8N5wX2fLJ6e142JzgAFKxt2s=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.1"
+        "homedir-polyfill": "1.0.1"
       }
     },
     "validate-npm-package-license": {
@@ -14115,8 +14115,8 @@
       "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
       "dev": true,
       "requires": {
-        "spdx-correct": "~1.0.0",
-        "spdx-expression-parse": "~1.0.0"
+        "spdx-correct": "1.0.2",
+        "spdx-expression-parse": "1.0.4"
       }
     },
     "validate-npm-package-name": {
@@ -14125,7 +14125,7 @@
       "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
       "dev": true,
       "requires": {
-        "builtins": "^1.0.3"
+        "builtins": "1.0.3"
       }
     },
     "vary": {
@@ -14140,9 +14140,9 @@
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
+        "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
+        "extsprintf": "1.3.0"
       },
       "dependencies": {
         "assert-plus": {
@@ -14159,8 +14159,8 @@
       "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
       "dev": true,
       "requires": {
-        "clone": "^1.0.0",
-        "clone-stats": "^0.0.1",
+        "clone": "1.0.3",
+        "clone-stats": "0.0.1",
         "replace-ext": "0.0.1"
       },
       "dependencies": {
@@ -14199,9 +14199,9 @@
       "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "chokidar": "2.0.3",
+        "graceful-fs": "4.1.11",
+        "neo-async": "2.5.1"
       },
       "dependencies": {
         "anymatch": {
@@ -14210,8 +14210,8 @@
           "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
           "dev": true,
           "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
+            "micromatch": "3.1.10",
+            "normalize-path": "2.1.1"
           }
         },
         "arr-diff": {
@@ -14232,16 +14232,16 @@
           "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
+            "arr-flatten": "1.1.0",
+            "array-unique": "0.3.2",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.2",
+            "snapdragon": "0.8.2",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "extend-shallow": {
@@ -14250,7 +14250,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -14261,18 +14261,18 @@
           "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
           "dev": true,
           "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.1.2",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^2.1.1",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.0"
+            "anymatch": "2.0.0",
+            "async-each": "1.0.1",
+            "braces": "2.3.2",
+            "fsevents": "1.2.4",
+            "glob-parent": "3.1.0",
+            "inherits": "2.0.3",
+            "is-binary-path": "1.0.1",
+            "is-glob": "4.0.0",
+            "normalize-path": "2.1.1",
+            "path-is-absolute": "1.0.1",
+            "readdirp": "2.1.0",
+            "upath": "1.0.5"
           }
         },
         "expand-brackets": {
@@ -14281,13 +14281,13 @@
           "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
           "dev": true,
           "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "define-property": {
@@ -14296,7 +14296,7 @@
               "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
               "dev": true,
               "requires": {
-                "is-descriptor": "^0.1.0"
+                "is-descriptor": "0.1.6"
               }
             },
             "extend-shallow": {
@@ -14305,7 +14305,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             },
             "is-accessor-descriptor": {
@@ -14314,7 +14314,7 @@
               "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
               "dev": true,
               "requires": {
-                "kind-of": "^3.0.2"
+                "kind-of": "3.2.2"
               },
               "dependencies": {
                 "kind-of": {
@@ -14323,7 +14323,7 @@
                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                   "dev": true,
                   "requires": {
-                    "is-buffer": "^1.1.5"
+                    "is-buffer": "1.1.6"
                   }
                 }
               }
@@ -14334,7 +14334,7 @@
               "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
               "dev": true,
               "requires": {
-                "kind-of": "^3.0.2"
+                "kind-of": "3.2.2"
               },
               "dependencies": {
                 "kind-of": {
@@ -14343,7 +14343,7 @@
                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                   "dev": true,
                   "requires": {
-                    "is-buffer": "^1.1.5"
+                    "is-buffer": "1.1.6"
                   }
                 }
               }
@@ -14354,9 +14354,9 @@
               "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
               "dev": true,
               "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
               }
             },
             "kind-of": {
@@ -14373,14 +14373,14 @@
           "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
           "dev": true,
           "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "define-property": {
@@ -14389,7 +14389,7 @@
               "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
               "dev": true,
               "requires": {
-                "is-descriptor": "^1.0.0"
+                "is-descriptor": "1.0.2"
               }
             },
             "extend-shallow": {
@@ -14398,7 +14398,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -14409,10 +14409,10 @@
           "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
           },
           "dependencies": {
             "extend-shallow": {
@@ -14421,7 +14421,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -14432,8 +14432,8 @@
           "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
           "dev": true,
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
+            "is-glob": "3.1.0",
+            "path-dirname": "1.0.2"
           },
           "dependencies": {
             "is-glob": {
@@ -14442,7 +14442,7 @@
               "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
               "dev": true,
               "requires": {
-                "is-extglob": "^2.1.0"
+                "is-extglob": "2.1.1"
               }
             }
           }
@@ -14453,7 +14453,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -14462,7 +14462,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -14471,9 +14471,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         },
         "is-extglob": {
@@ -14488,7 +14488,7 @@
           "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.1"
+            "is-extglob": "2.1.1"
           }
         },
         "is-number": {
@@ -14497,7 +14497,7 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -14506,7 +14506,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -14529,19 +14529,19 @@
           "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.9",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           }
         }
       }
@@ -14552,14 +14552,14 @@
       "integrity": "sha1-51xCOxC+eSZ6DD73bi6hBP4CZ6U=",
       "dev": true,
       "requires": {
-        "eachr": "^3.2.0",
-        "extendr": "^3.2.2",
-        "extract-opts": "^3.3.1",
-        "ignorefs": "^1.1.1",
-        "safefs": "^4.1.0",
-        "scandirectory": "^2.5.0",
-        "taskgroup": "^5.0.1",
-        "typechecker": "^4.3.0"
+        "eachr": "3.2.0",
+        "extendr": "3.3.0",
+        "extract-opts": "3.3.1",
+        "ignorefs": "1.2.0",
+        "safefs": "4.1.0",
+        "scandirectory": "2.5.0",
+        "taskgroup": "5.0.1",
+        "typechecker": "4.5.0"
       }
     },
     "wbuf": {
@@ -14568,7 +14568,7 @@
       "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
       "requires": {
-        "minimalistic-assert": "^1.0.0"
+        "minimalistic-assert": "1.0.1"
       }
     },
     "web-animations-js": {
@@ -14582,8 +14582,8 @@
       "integrity": "sha1-gcUzqeM9W/tZe05j4s2yW1R3dRU=",
       "dev": true,
       "requires": {
-        "@types/selenium-webdriver": "^2.53.35",
-        "selenium-webdriver": "^2.53.2"
+        "@types/selenium-webdriver": "2.53.43",
+        "selenium-webdriver": "2.53.3"
       },
       "dependencies": {
         "adm-zip": {
@@ -14605,9 +14605,9 @@
           "dev": true,
           "requires": {
             "adm-zip": "0.4.4",
-            "rimraf": "^2.2.8",
+            "rimraf": "2.6.1",
             "tmp": "0.0.24",
-            "ws": "^1.0.1",
+            "ws": "1.1.2",
             "xml2js": "0.4.4"
           }
         },
@@ -14623,8 +14623,8 @@
           "integrity": "sha1-MREBAAMAiuGSQOuhdJe1fHKcVV0=",
           "dev": true,
           "requires": {
-            "sax": "0.6.x",
-            "xmlbuilder": ">=1.0.0"
+            "sax": "0.6.1",
+            "xmlbuilder": "9.0.7"
           }
         }
       }
@@ -14635,25 +14635,25 @@
       "integrity": "sha512-Fu/k/3fZeGtIhuFkiYpIy1UDHhMiGKjG4FFPVuvG+5Os2lWA1ttWpmi9Qnn6AgfZqj9MvhZW/rmj/ip+nHr06g==",
       "dev": true,
       "requires": {
-        "acorn": "^5.0.0",
-        "acorn-dynamic-import": "^3.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "chrome-trace-event": "^0.1.1",
-        "enhanced-resolve": "^4.0.0",
-        "eslint-scope": "^3.7.1",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "micromatch": "^3.1.8",
-        "mkdirp": "~0.5.0",
-        "neo-async": "^2.5.0",
-        "node-libs-browser": "^2.0.0",
-        "schema-utils": "^0.4.4",
-        "tapable": "^1.0.0",
-        "uglifyjs-webpack-plugin": "^1.2.4",
-        "watchpack": "^1.5.0",
-        "webpack-sources": "^1.0.1"
+        "acorn": "5.5.3",
+        "acorn-dynamic-import": "3.0.0",
+        "ajv": "6.1.1",
+        "ajv-keywords": "3.1.0",
+        "chrome-trace-event": "0.1.3",
+        "enhanced-resolve": "4.0.0",
+        "eslint-scope": "3.7.1",
+        "loader-runner": "2.3.0",
+        "loader-utils": "1.1.0",
+        "memory-fs": "0.4.1",
+        "micromatch": "3.1.10",
+        "mkdirp": "0.5.1",
+        "neo-async": "2.5.1",
+        "node-libs-browser": "2.1.0",
+        "schema-utils": "0.4.5",
+        "tapable": "1.0.0",
+        "uglifyjs-webpack-plugin": "1.2.5",
+        "watchpack": "1.6.0",
+        "webpack-sources": "1.1.0"
       },
       "dependencies": {
         "arr-diff": {
@@ -14674,16 +14674,16 @@
           "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
+            "arr-flatten": "1.1.0",
+            "array-unique": "0.3.2",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.2",
+            "snapdragon": "0.8.2",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "extend-shallow": {
@@ -14692,7 +14692,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -14703,13 +14703,13 @@
           "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
           "dev": true,
           "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "define-property": {
@@ -14718,7 +14718,7 @@
               "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
               "dev": true,
               "requires": {
-                "is-descriptor": "^0.1.0"
+                "is-descriptor": "0.1.6"
               }
             },
             "extend-shallow": {
@@ -14727,7 +14727,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             },
             "is-accessor-descriptor": {
@@ -14736,7 +14736,7 @@
               "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
               "dev": true,
               "requires": {
-                "kind-of": "^3.0.2"
+                "kind-of": "3.2.2"
               },
               "dependencies": {
                 "kind-of": {
@@ -14745,7 +14745,7 @@
                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                   "dev": true,
                   "requires": {
-                    "is-buffer": "^1.1.5"
+                    "is-buffer": "1.1.6"
                   }
                 }
               }
@@ -14756,7 +14756,7 @@
               "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
               "dev": true,
               "requires": {
-                "kind-of": "^3.0.2"
+                "kind-of": "3.2.2"
               },
               "dependencies": {
                 "kind-of": {
@@ -14765,7 +14765,7 @@
                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                   "dev": true,
                   "requires": {
-                    "is-buffer": "^1.1.5"
+                    "is-buffer": "1.1.6"
                   }
                 }
               }
@@ -14776,9 +14776,9 @@
               "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
               "dev": true,
               "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
               }
             },
             "kind-of": {
@@ -14795,14 +14795,14 @@
           "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
           "dev": true,
           "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "define-property": {
@@ -14811,7 +14811,7 @@
               "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
               "dev": true,
               "requires": {
-                "is-descriptor": "^1.0.0"
+                "is-descriptor": "1.0.2"
               }
             },
             "extend-shallow": {
@@ -14820,7 +14820,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -14831,10 +14831,10 @@
           "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
           },
           "dependencies": {
             "extend-shallow": {
@@ -14843,7 +14843,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -14854,7 +14854,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -14863,7 +14863,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -14872,9 +14872,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         },
         "is-number": {
@@ -14883,7 +14883,7 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -14892,7 +14892,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -14915,19 +14915,19 @@
           "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.9",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           }
         }
       }
@@ -14938,8 +14938,8 @@
       "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
       "dev": true,
       "requires": {
-        "source-list-map": "~0.1.7",
-        "source-map": "~0.4.1"
+        "source-list-map": "0.1.8",
+        "source-map": "0.4.4"
       },
       "dependencies": {
         "source-list-map": {
@@ -14954,7 +14954,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -14965,13 +14965,13 @@
       "integrity": "sha512-I6Mmy/QjWU/kXwCSFGaiOoL5YEQIVmbb0o45xMoCyQAg/mClqZVTcsX327sPfekDyJWpCxb+04whNyLOIxpJdQ==",
       "dev": true,
       "requires": {
-        "loud-rejection": "^1.6.0",
-        "memory-fs": "~0.4.1",
-        "mime": "^2.1.0",
-        "path-is-absolute": "^1.0.0",
-        "range-parser": "^1.0.3",
-        "url-join": "^4.0.0",
-        "webpack-log": "^1.0.1"
+        "loud-rejection": "1.6.0",
+        "memory-fs": "0.4.1",
+        "mime": "2.3.1",
+        "path-is-absolute": "1.0.1",
+        "range-parser": "1.2.0",
+        "url-join": "4.0.0",
+        "webpack-log": "1.2.0"
       },
       "dependencies": {
         "mime": {
@@ -14989,32 +14989,32 @@
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
-        "array-includes": "^3.0.3",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.0.0",
-        "compression": "^1.5.2",
-        "connect-history-api-fallback": "^1.3.0",
-        "debug": "^3.1.0",
-        "del": "^3.0.0",
-        "express": "^4.16.2",
-        "html-entities": "^1.2.0",
-        "http-proxy-middleware": "~0.18.0",
-        "import-local": "^1.0.0",
+        "array-includes": "3.0.3",
+        "bonjour": "3.5.0",
+        "chokidar": "2.0.3",
+        "compression": "1.7.2",
+        "connect-history-api-fallback": "1.5.0",
+        "debug": "3.1.0",
+        "del": "3.0.0",
+        "express": "4.16.3",
+        "html-entities": "1.2.1",
+        "http-proxy-middleware": "0.18.0",
+        "import-local": "1.0.0",
         "internal-ip": "1.2.0",
-        "ip": "^1.1.5",
-        "killable": "^1.0.0",
-        "loglevel": "^1.4.1",
-        "opn": "^5.1.0",
-        "portfinder": "^1.0.9",
-        "selfsigned": "^1.9.1",
-        "serve-index": "^1.7.2",
+        "ip": "1.1.5",
+        "killable": "1.0.0",
+        "loglevel": "1.6.1",
+        "opn": "5.1.0",
+        "portfinder": "1.0.13",
+        "selfsigned": "1.10.3",
+        "serve-index": "1.9.1",
         "sockjs": "0.3.19",
         "sockjs-client": "1.1.4",
-        "spdy": "^3.4.1",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^5.1.0",
+        "spdy": "3.4.7",
+        "strip-ansi": "3.0.1",
+        "supports-color": "5.4.0",
         "webpack-dev-middleware": "3.1.3",
-        "webpack-log": "^1.1.2",
+        "webpack-log": "1.2.0",
         "yargs": "11.0.0"
       },
       "dependencies": {
@@ -15030,8 +15030,8 @@
           "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
           "dev": true,
           "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
+            "micromatch": "3.1.10",
+            "normalize-path": "2.1.1"
           }
         },
         "arr-diff": {
@@ -15052,16 +15052,16 @@
           "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
+            "arr-flatten": "1.1.0",
+            "array-unique": "0.3.2",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.2",
+            "snapdragon": "0.8.2",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "extend-shallow": {
@@ -15070,7 +15070,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -15087,18 +15087,18 @@
           "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
           "dev": true,
           "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.1.2",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^2.1.1",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.0"
+            "anymatch": "2.0.0",
+            "async-each": "1.0.1",
+            "braces": "2.3.2",
+            "fsevents": "1.2.4",
+            "glob-parent": "3.1.0",
+            "inherits": "2.0.3",
+            "is-binary-path": "1.0.1",
+            "is-glob": "4.0.0",
+            "normalize-path": "2.1.1",
+            "path-is-absolute": "1.0.1",
+            "readdirp": "2.1.0",
+            "upath": "1.0.5"
           }
         },
         "cliui": {
@@ -15107,9 +15107,9 @@
           "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
           "dev": true,
           "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "2.1.1",
+            "strip-ansi": "4.0.0",
+            "wrap-ansi": "2.1.0"
           },
           "dependencies": {
             "strip-ansi": {
@@ -15118,7 +15118,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -15138,13 +15138,13 @@
           "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
           "dev": true,
           "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "debug": {
@@ -15162,7 +15162,7 @@
               "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
               "dev": true,
               "requires": {
-                "is-descriptor": "^0.1.0"
+                "is-descriptor": "0.1.6"
               }
             },
             "extend-shallow": {
@@ -15171,7 +15171,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             },
             "is-accessor-descriptor": {
@@ -15180,7 +15180,7 @@
               "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
               "dev": true,
               "requires": {
-                "kind-of": "^3.0.2"
+                "kind-of": "3.2.2"
               },
               "dependencies": {
                 "kind-of": {
@@ -15189,7 +15189,7 @@
                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                   "dev": true,
                   "requires": {
-                    "is-buffer": "^1.1.5"
+                    "is-buffer": "1.1.6"
                   }
                 }
               }
@@ -15200,7 +15200,7 @@
               "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
               "dev": true,
               "requires": {
-                "kind-of": "^3.0.2"
+                "kind-of": "3.2.2"
               },
               "dependencies": {
                 "kind-of": {
@@ -15209,7 +15209,7 @@
                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                   "dev": true,
                   "requires": {
-                    "is-buffer": "^1.1.5"
+                    "is-buffer": "1.1.6"
                   }
                 }
               }
@@ -15220,9 +15220,9 @@
               "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
               "dev": true,
               "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
               }
             },
             "kind-of": {
@@ -15239,14 +15239,14 @@
           "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
           "dev": true,
           "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           },
           "dependencies": {
             "define-property": {
@@ -15255,7 +15255,7 @@
               "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
               "dev": true,
               "requires": {
-                "is-descriptor": "^1.0.0"
+                "is-descriptor": "1.0.2"
               }
             },
             "extend-shallow": {
@@ -15264,7 +15264,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -15275,10 +15275,10 @@
           "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
           },
           "dependencies": {
             "extend-shallow": {
@@ -15287,7 +15287,7 @@
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extendable": "0.1.1"
               }
             }
           }
@@ -15298,8 +15298,8 @@
           "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
           "dev": true,
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
+            "is-glob": "3.1.0",
+            "path-dirname": "1.0.2"
           },
           "dependencies": {
             "is-glob": {
@@ -15308,7 +15308,7 @@
               "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
               "dev": true,
               "requires": {
-                "is-extglob": "^2.1.0"
+                "is-extglob": "2.1.1"
               }
             }
           }
@@ -15325,7 +15325,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -15334,7 +15334,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -15343,9 +15343,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         },
         "is-extglob": {
@@ -15366,7 +15366,7 @@
           "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.1"
+            "is-extglob": "2.1.1"
           }
         },
         "is-number": {
@@ -15375,7 +15375,7 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -15384,7 +15384,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -15407,19 +15407,19 @@
           "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.9",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.2",
+            "snapdragon": "0.8.2",
+            "to-regex": "3.0.2"
           }
         },
         "os-locale": {
@@ -15428,9 +15428,9 @@
           "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
-            "execa": "^0.7.0",
-            "lcid": "^1.0.0",
-            "mem": "^1.1.0"
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
           }
         },
         "string-width": {
@@ -15439,8 +15439,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
           },
           "dependencies": {
             "strip-ansi": {
@@ -15449,7 +15449,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -15460,7 +15460,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         },
         "which-module": {
@@ -15481,18 +15481,18 @@
           "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.1.1",
-            "find-up": "^2.1.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^9.0.2"
+            "cliui": "4.1.0",
+            "decamelize": "1.2.0",
+            "find-up": "2.1.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "2.1.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "9.0.2"
           }
         },
         "yargs-parser": {
@@ -15501,7 +15501,7 @@
           "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           }
         }
       }
@@ -15512,10 +15512,10 @@
       "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.1.0",
-        "log-symbols": "^2.1.0",
-        "loglevelnext": "^1.0.1",
-        "uuid": "^3.1.0"
+        "chalk": "2.2.2",
+        "log-symbols": "2.2.0",
+        "loglevelnext": "1.0.5",
+        "uuid": "3.2.1"
       },
       "dependencies": {
         "log-symbols": {
@@ -15524,7 +15524,7 @@
           "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
           "dev": true,
           "requires": {
-            "chalk": "^2.0.1"
+            "chalk": "2.2.2"
           }
         }
       }
@@ -15535,7 +15535,7 @@
       "integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.5"
+        "lodash": "4.17.5"
       }
     },
     "webpack-sources": {
@@ -15544,8 +15544,8 @@
       "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==",
       "dev": true,
       "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "source-list-map": "2.0.0",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -15562,7 +15562,7 @@
       "integrity": "sha1-xcTj1pD50vZKlVDgeodn+Xlqpdg=",
       "dev": true,
       "requires": {
-        "webpack-core": "^0.6.8"
+        "webpack-core": "0.6.9"
       }
     },
     "websocket-driver": {
@@ -15571,8 +15571,8 @@
       "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
       "dev": true,
       "requires": {
-        "http-parser-js": ">=0.4.0",
-        "websocket-extensions": ">=0.1.1"
+        "http-parser-js": "0.4.10",
+        "websocket-extensions": "0.1.3"
       }
     },
     "websocket-extensions": {
@@ -15593,7 +15593,7 @@
       "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
       "dev": true,
       "requires": {
-        "isexe": "^2.0.0"
+        "isexe": "2.0.0"
       }
     },
     "which-module": {
@@ -15608,7 +15608,7 @@
       "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.2"
+        "string-width": "1.0.2"
       }
     },
     "win-release": {
@@ -15617,7 +15617,7 @@
       "integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
       "dev": true,
       "requires": {
-        "semver": "^5.0.1"
+        "semver": "5.5.0"
       }
     },
     "window-size": {
@@ -15639,7 +15639,7 @@
       "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
       "dev": true,
       "requires": {
-        "errno": "~0.1.7"
+        "errno": "0.1.7"
       }
     },
     "wrap-ansi": {
@@ -15648,8 +15648,8 @@
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
       }
     },
     "wrappy": {
@@ -15664,7 +15664,7 @@
       "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
       "dev": true,
       "requires": {
-        "mkdirp": "^0.5.1"
+        "mkdirp": "0.5.1"
       }
     },
     "write-file-stdout": {
@@ -15679,8 +15679,8 @@
       "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=",
       "dev": true,
       "requires": {
-        "options": ">=0.0.5",
-        "ultron": "1.0.x"
+        "options": "0.0.6",
+        "ultron": "1.0.2"
       }
     },
     "wtf-8": {
@@ -15695,8 +15695,8 @@
       "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
       "dev": true,
       "requires": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~9.0.1"
+        "sax": "1.2.4",
+        "xmlbuilder": "9.0.7"
       },
       "dependencies": {
         "sax": {
@@ -15731,7 +15731,7 @@
       "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
       "dev": true,
       "requires": {
-        "cuint": "^0.2.2"
+        "cuint": "0.2.2"
       }
     },
     "y18n": {
@@ -15752,19 +15752,19 @@
       "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
       "dev": true,
       "requires": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.0"
+        "camelcase": "3.0.0",
+        "cliui": "3.2.0",
+        "decamelize": "1.2.0",
+        "get-caller-file": "1.0.2",
+        "os-locale": "1.4.0",
+        "read-pkg-up": "1.0.1",
+        "require-directory": "2.1.1",
+        "require-main-filename": "1.0.1",
+        "set-blocking": "2.0.0",
+        "string-width": "1.0.2",
+        "which-module": "1.0.0",
+        "y18n": "3.2.1",
+        "yargs-parser": "5.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -15785,7 +15785,7 @@
           "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0"
+            "camelcase": "3.0.0"
           }
         }
       }
@@ -15796,7 +15796,7 @@
       "integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==",
       "dev": true,
       "requires": {
-        "camelcase": "^4.1.0"
+        "camelcase": "4.1.0"
       },
       "dependencies": {
         "camelcase": {
diff --git a/package.json b/package.json
index d18796e759..ac41891963 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "intl": "1.2.5",
     "ionicons": "2.0.1",
     "leaflet": "1.2.0",
-    "nebular-icons": "1.0.9",
+    "nebular-icons": "1.1.0",
     "ng2-ckeditor": "1.1.13",
     "ng2-completer": "2.0.8",
     "ng2-smart-table": "1.3.5",

From ccb4ca4193c06175f3e7126b6f7d3be2865f53a5 Mon Sep 17 00:00:00 2001
From: denStrigo <d.strigo@akveo.com>
Date: Fri, 9 Nov 2018 19:18:04 +0300
Subject: [PATCH 04/11] feat(components): add new nebular alert, calendar,
 checkbox, input, radio, select, infinity list, list, progress bar, spinner,
 toaster, , component

---
 src/app/@theme/theme.module.ts                |  13 +
 .../pages/nebular/alert/alert.component.html  |  46 +++
 .../pages/nebular/alert/alert.component.ts    |   9 +
 .../nebular/calundar/calendar.component.html  |  47 ++-
 .../nebular/calundar/calendar.component.scss  |   2 +-
 .../nebular-checkbox.component.html           |   5 +
 .../nebular-checkbox.component.scss           |   7 +
 .../nebular-checkbox.component.ts             |  10 +
 .../nebular-form-inputs.component.html        |  24 ++
 .../nebular-form-inputs.component.scss        |  11 +
 .../nebular-form-inputs.component.ts          |  10 +
 .../nebular-inputs.component.html             |  33 ++
 .../nebular-inputs.component.scss             |   7 +
 .../nebular-inputs.component.ts               |  10 +
 .../nebular-radio-group.component.html        |  10 +
 .../nebular-radio-group.component.scss        |  12 +
 .../nebular-radio-group.component.ts          |  16 +
 .../nebular-select.component.html             | 300 +++++++++++++++
 .../nebular-select.component.scss             |  21 ++
 .../nebular-select.component.ts               |  17 +
 .../infinite-list.component.html              |  40 ++
 .../infinite-list.component.scss              |  20 +
 .../infinite-list/infinite-list.component.ts  |  41 ++
 .../news-post-placeholder.component.html      |   3 +
 .../news-post-placeholder.component.scss      |  25 ++
 .../news-post-placeholder.component.ts        |  12 +
 .../news-post/news-post.component.html        |   5 +
 .../news-post/news-post.component.ts          |  12 +
 src/app/pages/nebular/list/fruits-list.ts     |  13 +
 .../pages/nebular/list/list.component.html    |  26 ++
 .../pages/nebular/list/list.component.scss    |  24 ++
 src/app/pages/nebular/list/list.component.ts  |  19 +
 .../pages/nebular/nebular-routing.module.ts   |  35 ++
 src/app/pages/nebular/nebular.module.ts       |  49 ++-
 .../interactive-progress-bar.component.html   |  14 +
 .../interactive-progress-bar.component.scss   |  12 +
 .../interactive-progress-bar.component.ts     |  27 ++
 .../progress-bar/progress-bar.component.html  |  38 ++
 .../progress-bar/progress-bar.component.scss  |   7 +
 .../progress-bar/progress-bar.component.ts    |  10 +
 .../pages/nebular/services/news.service.ts    |  30 ++
 .../spinner-color.component.html              |  44 +++
 .../spinner-color/spinner-color.component.ts  |   9 +
 .../spinner-in-buttons.component.html         |  39 ++
 .../spinner-in-buttons.component.scss         |   7 +
 .../spinner-in-buttons.component.ts           |  17 +
 .../spinner-in-tabs.component.html            |  20 +
 .../spinner-in-tabs.component.scss            |   7 +
 .../spinner-in-tabs.component.ts              |  17 +
 .../spinner-sizes.component.html              |  44 +++
 .../spinner-sizes/spinner-sizes.component.ts  |   9 +
 .../nebular/spinner/spinner.component.html    |  17 +
 .../nebular/spinner/spinner.component.scss    |  11 +
 .../nebular/spinner/spinner.component.ts      |  17 +
 .../nebular/toastr/toastr.component.html      |   3 +
 .../nebular/toastr/toastr.component.scss      |   5 +
 .../pages/nebular/toastr/toastr.component.ts  |  10 +
 src/app/pages/pages-menu.ts                   |  28 ++
 src/assets/data/news.json                     | 352 ++++++++++++++++++
 59 files changed, 1700 insertions(+), 28 deletions(-)
 create mode 100644 src/app/pages/nebular/alert/alert.component.html
 create mode 100644 src/app/pages/nebular/alert/alert.component.ts
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.html
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.scss
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.ts
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-form-inputs.component.html
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-form-inputs.component.scss
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-form-inputs.component.ts
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.scss
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.ts
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.html
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.scss
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.ts
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.html
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.scss
 create mode 100644 src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.ts
 create mode 100644 src/app/pages/nebular/infinite-list/infinite-list.component.html
 create mode 100644 src/app/pages/nebular/infinite-list/infinite-list.component.scss
 create mode 100644 src/app/pages/nebular/infinite-list/infinite-list.component.ts
 create mode 100644 src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.html
 create mode 100644 src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.scss
 create mode 100644 src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.ts
 create mode 100644 src/app/pages/nebular/infinite-list/news-post/news-post.component.html
 create mode 100644 src/app/pages/nebular/infinite-list/news-post/news-post.component.ts
 create mode 100644 src/app/pages/nebular/list/fruits-list.ts
 create mode 100644 src/app/pages/nebular/list/list.component.html
 create mode 100644 src/app/pages/nebular/list/list.component.scss
 create mode 100644 src/app/pages/nebular/list/list.component.ts
 create mode 100644 src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html
 create mode 100644 src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss
 create mode 100644 src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts
 create mode 100644 src/app/pages/nebular/progress-bar/progress-bar.component.html
 create mode 100644 src/app/pages/nebular/progress-bar/progress-bar.component.scss
 create mode 100644 src/app/pages/nebular/progress-bar/progress-bar.component.ts
 create mode 100644 src/app/pages/nebular/services/news.service.ts
 create mode 100644 src/app/pages/nebular/spinner/spinner-color/spinner-color.component.html
 create mode 100644 src/app/pages/nebular/spinner/spinner-color/spinner-color.component.ts
 create mode 100644 src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.html
 create mode 100644 src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
 create mode 100644 src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.ts
 create mode 100644 src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.html
 create mode 100644 src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.scss
 create mode 100644 src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.ts
 create mode 100644 src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.html
 create mode 100644 src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.ts
 create mode 100644 src/app/pages/nebular/spinner/spinner.component.html
 create mode 100644 src/app/pages/nebular/spinner/spinner.component.scss
 create mode 100644 src/app/pages/nebular/spinner/spinner.component.ts
 create mode 100644 src/app/pages/nebular/toastr/toastr.component.html
 create mode 100644 src/app/pages/nebular/toastr/toastr.component.scss
 create mode 100644 src/app/pages/nebular/toastr/toastr.component.ts
 create mode 100644 src/assets/data/news.json

diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts
index dffef8b0b7..bc0b9fc4c5 100644
--- a/src/app/@theme/theme.module.ts
+++ b/src/app/@theme/theme.module.ts
@@ -27,6 +27,12 @@ import {
   NbDatepickerModule,
   NbDialogModule,
   NbWindowModule,
+  NbListModule,
+  NbToastrModule,
+  NbAlertModule,
+  NbSpinnerModule,
+  NbRadioModule,
+  NbSelectModule,
 } from '@nebular/theme';
 
 import { NbSecurityModule } from '@nebular/security';
@@ -81,11 +87,17 @@ const NB_MODULES = [
   NbCalendarRangeModule,
   NbStepperModule,
   NbButtonModule,
+  NbListModule,
+  NbToastrModule,
   NbInputModule,
   NbAccordionModule,
   NbDatepickerModule,
   NbDialogModule,
   NbWindowModule,
+  NbAlertModule,
+  NbSpinnerModule,
+  NbRadioModule,
+  NbSelectModule,
 ];
 
 const COMPONENTS = [
@@ -128,6 +140,7 @@ const NB_THEME_PROVIDERS = [
   ...NbDatepickerModule.forRoot().providers,
   ...NbDialogModule.forRoot().providers,
   ...NbWindowModule.forRoot().providers,
+  ...NbToastrModule.forRoot().providers,
 ];
 
 @NgModule({
diff --git a/src/app/pages/nebular/alert/alert.component.html b/src/app/pages/nebular/alert/alert.component.html
new file mode 100644
index 0000000000..435f911ca7
--- /dev/null
+++ b/src/app/pages/nebular/alert/alert.component.html
@@ -0,0 +1,46 @@
+<nb-card>
+  <nb-card-header>Alert</nb-card-header>
+</nb-card>
+<div class="row">
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <nb-card>
+      <nb-card-header>Colored Alert</nb-card-header>
+      <nb-card-body>
+        <nb-alert status="success">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="danger">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="primary">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="info">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="warning">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="active">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="disabled">You have been successfully authenticated!</nb-alert>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-card>
+      <nb-card-header>Outline Alert</nb-card-header>
+      <nb-card-body>
+        <nb-alert outline="success">You have been successfully authenticated!</nb-alert>
+        <nb-alert outline="danger">You have been successfully authenticated!</nb-alert>
+        <nb-alert outline="primary">You have been successfully authenticated!</nb-alert>
+        <nb-alert outline="info">You have been successfully authenticated!</nb-alert>
+        <nb-alert outline="warning">You have been successfully authenticated!</nb-alert>
+        <nb-alert outline="active">You have been successfully authenticated!</nb-alert>
+        <nb-alert outline="disabled">You have been successfully authenticated!</nb-alert>
+      </nb-card-body>
+    </nb-card>
+  </div>
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <nb-card>
+      <nb-card-header>Accent Alert</nb-card-header>
+      <nb-card-body>
+        <nb-alert status="success" accent="danger">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="danger" accent="primary">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="primary" accent="info">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="info" accent="warning">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="warning" accent="danger">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="active" accent="disabled">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="disabled" accent="success">You have been successfully authenticated!</nb-alert>
+      </nb-card-body>
+    </nb-card>
+  </div>
+</div>
diff --git a/src/app/pages/nebular/alert/alert.component.ts b/src/app/pages/nebular/alert/alert.component.ts
new file mode 100644
index 0000000000..120ba6d38b
--- /dev/null
+++ b/src/app/pages/nebular/alert/alert.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-alert',
+  templateUrl: 'alert.component.html',
+})
+export class AlertComponent {
+
+}
diff --git a/src/app/pages/nebular/calundar/calendar.component.html b/src/app/pages/nebular/calundar/calendar.component.html
index d362d39b9c..1ef119fef4 100644
--- a/src/app/pages/nebular/calundar/calendar.component.html
+++ b/src/app/pages/nebular/calundar/calendar.component.html
@@ -1,26 +1,21 @@
-<nb-card>
-  <nb-card-header>
-    Calendar
-  </nb-card-header>
-  <nb-card-body>
-    <div class="nebular-calendar">
-      <h2>
-        Selected date: {{ date | date }}
-      </h2>
-      <nb-calendar [(date)]="date" [boundingMonth]="true"></nb-calendar>
-    </div>
-    <div class="nebular-calendar">
-      <h2>
-        Selected range: {{ range.start | date }} - {{ range.end | date }}
-      </h2>
-      <nb-calendar-range [(range)]="range"></nb-calendar-range>
-    </div>
-    <div class="nebular-calendar">
-      <h1>Selected date: {{ date2 | date }}</h1>
-      <nb-calendar
-        [(date)]="date2"
-        [dayCellComponent]="dayCellComponent"
-      ></nb-calendar>
-    </div>
-  </nb-card-body>
-</nb-card>
+<div class="calendars-container">
+  <div class="nebular-calendar">
+    <h2>
+      Selected date: {{ date | date }}
+    </h2>
+    <nb-calendar [(date)]="date" [boundingMonth]="true"></nb-calendar>
+  </div>
+  <div class="nebular-calendar">
+    <h2>
+      Selected range: {{ range.start | date }} - {{ range.end | date }}
+    </h2>
+    <nb-calendar-range [(range)]="range"></nb-calendar-range>
+  </div>
+  <div class="nebular-calendar">
+    <h1>Selected date: {{ date2 | date }}</h1>
+    <nb-calendar
+      [(date)]="date2"
+      [dayCellComponent]="dayCellComponent"
+    ></nb-calendar>
+  </div>
+</div>
diff --git a/src/app/pages/nebular/calundar/calendar.component.scss b/src/app/pages/nebular/calundar/calendar.component.scss
index 1a296304bc..b75a7fb51e 100644
--- a/src/app/pages/nebular/calundar/calendar.component.scss
+++ b/src/app/pages/nebular/calundar/calendar.component.scss
@@ -2,7 +2,7 @@
 
 @include nb-install-component() {
 
-  nb-card-body {
+  .calendars-container {
     display: flex;
     justify-content: space-between;
     align-items: center;
diff --git a/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.html b/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.html
new file mode 100644
index 0000000000..612af1ae21
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.html
@@ -0,0 +1,5 @@
+<nb-checkbox>Default Nebular Checkbox</nb-checkbox>
+<nb-checkbox disabled>Disabled Nebular Checkbox</nb-checkbox>
+<nb-checkbox status="success">Success Nebular Checkbox</nb-checkbox>
+<nb-checkbox status="warning">Warning Nebular Checkbox</nb-checkbox>
+<nb-checkbox status="danger">Danger Nebular Checkbox</nb-checkbox>
diff --git a/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.scss b/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.scss
new file mode 100644
index 0000000000..7cc095a554
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.scss
@@ -0,0 +1,7 @@
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  nb-checkbox {
+    display: block;
+  }
+}
diff --git a/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.ts b/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.ts
new file mode 100644
index 0000000000..63f1991a83
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-nebular-checkbox',
+  templateUrl: 'nebular-checkbox.component.html',
+  styleUrls: ['nebular-checkbox.component.scss'],
+})
+export class NebularCheckboxComponent {
+
+}
diff --git a/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.html b/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.html
new file mode 100644
index 0000000000..a6f80c2f31
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.html
@@ -0,0 +1,24 @@
+<nb-card>
+  <nb-card-header>Nebular Form Inputs</nb-card-header>
+</nb-card>
+<div class="row">
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <ngx-nebular-inputs></ngx-nebular-inputs>
+  </div>
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <nb-card>
+      <nb-card-header>Checkbox & Radio </nb-card-header>
+      <nb-card-body>
+        <div class="row">
+          <div class="col-md-12 col-lg-12 col-xxxl-6 inputs-group-margin-bottom">
+            <ngx-nebular-checkbox></ngx-nebular-checkbox>
+          </div>
+          <div class="col-md-12 col-lg-12 col-xxxl-6 inputs-group-margin-bottom">
+            <ngx-nebular-radio-group></ngx-nebular-radio-group>
+          </div>
+        </div>
+      </nb-card-body>
+    </nb-card>
+    <ngx-nebular-select></ngx-nebular-select>
+  </div>
+</div>
diff --git a/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.scss b/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.scss
new file mode 100644
index 0000000000..ca85fb921a
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.scss
@@ -0,0 +1,11 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  .inputs-group-margin-bottom {
+    margin-bottom: 2rem;
+
+    &:last-child {
+      margin: 0;
+    }
+  }
+}
diff --git a/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.ts b/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.ts
new file mode 100644
index 0000000000..d9757c112f
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-nebular-form-inputs',
+  templateUrl: 'nebular-form-inputs.component.html',
+  styleUrls: ['nebular-form-inputs.component.scss'],
+})
+export class NebularFormInputsComponent {
+
+}
diff --git a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
new file mode 100644
index 0000000000..6078e10436
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
@@ -0,0 +1,33 @@
+<nb-card>
+  <nb-card-header>Nebular Inputs</nb-card-header>
+  <nb-card-body>
+    <input type="text" nbInput placeholder="Initial width">
+    <input type="text" nbInput fullWidth placeholder="Full width">
+    <textarea nbInput placeholder="Initial width"></textarea>
+    <textarea nbInput fullWidth placeholder="Full width"></textarea>
+  </nb-card-body>
+
+  <nb-card-body>
+    <input type="text" nbInput fullWidth fieldSize="small" placeholder="Input">
+    <textarea nbInput fullWidth shape="round" placeholder="Textarea"></textarea>
+  </nb-card-body>
+
+  <nb-card-body>
+    <input type="text" nbInput fullWidth shape="rectangle" placeholder="Rectangle">
+    <input type="text" nbInput fullWidth shape="semi-round" placeholder="Semi round">
+    <input type="text" nbInput fullWidth shape="round" placeholder="Round">
+  </nb-card-body>
+
+  <nb-card-body>
+    <input type="text" nbInput fullWidth fieldSize="small" placeholder="Small">
+    <input type="text" nbInput fullWidth fieldSize="medium" placeholder="Medium">
+    <input type="text" nbInput fullWidth fieldSize="large" placeholder="Large">
+  </nb-card-body>
+
+  <nb-card-body>
+    <input type="text" nbInput fullWidth status="info" placeholder="Info">
+    <input type="text" nbInput fullWidth status="success" placeholder="Success">
+    <input type="text" nbInput fullWidth status="warning" placeholder="Warning">
+    <input type="text" nbInput fullWidth status="danger" placeholder="Danger">
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.scss b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.scss
new file mode 100644
index 0000000000..09aba6118d
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.scss
@@ -0,0 +1,7 @@
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  [nbInput] {
+    margin-bottom: 1rem;
+  }
+}
diff --git a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.ts b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.ts
new file mode 100644
index 0000000000..e78a41db1e
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-nebular-inputs',
+  templateUrl: 'nebular-inputs.component.html',
+  styleUrls: ['nebular-inputs.component.scss'],
+})
+export class NebularInputsComponent {
+
+}
diff --git a/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.html b/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.html
new file mode 100644
index 0000000000..990a10f3f8
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.html
@@ -0,0 +1,10 @@
+<div>Selected value: <span class="value">{{ option }}</span></div>
+
+<nb-radio-group [(ngModel)]="option">
+  <nb-radio
+    *ngFor="let option of options"
+    [disabled]="option.disabled"
+    [value]="option.value">
+    {{ option.label }}
+  </nb-radio>
+</nb-radio-group>
diff --git a/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.scss b/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.scss
new file mode 100644
index 0000000000..40c88c55fb
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.scss
@@ -0,0 +1,12 @@
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  .value {
+    font-weight: nb-theme(font-weight-bold);
+  }
+  
+  nb-radio-group {
+    display: block;
+    margin-top: 0.5rem;
+  }
+}
diff --git a/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.ts b/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.ts
new file mode 100644
index 0000000000..b53681f8d1
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.ts
@@ -0,0 +1,16 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-nebular-radio-group',
+  templateUrl: 'nebular-radio-group.component.html',
+  styleUrls: ['nebular-radio-group.component.scss'],
+})
+export class NebularRadioGroupComponent {
+  options = [
+    { value: 'This is value 1', label: 'Option 1' },
+    { value: 'This is value 2', label: 'Option 2 Disabled', disabled: true },
+    { value: 'This is value 3', label: 'Option 3' },
+    { value: 'This is value 5', label: 'Option 4' },
+  ];
+  option;
+}
diff --git a/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.html b/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.html
new file mode 100644
index 0000000000..e87f6d2194
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.html
@@ -0,0 +1,300 @@
+<nb-card>
+  <nb-card-header>Nebular Select</nb-card-header>
+  <nb-card-body>
+    <nb-select placeholder="Select Showcase" [(selected)]="commonSelectedItem">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+  </nb-card-body>
+
+  <nb-card-body>
+    <nb-select multiple placeholder="Multiple Select">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+  </nb-card-body>
+
+  <nb-card-body>
+    <nb-select placeholder="Cleanable">
+      <nb-option>Clean</nb-option>
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+  </nb-card-body>
+
+  <nb-card-body class="select-form-binding">
+    <nb-select placeholder="NgModel" [(ngModel)]="selectedItemNgModel">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Form control" [formControl]="selectedItemFormControl">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+  </nb-card-body>
+
+  <nb-card-body class="select-grouping">
+    <nb-select placeholder="Select Groups">
+
+      <nb-option-group title="Group 1">
+        <nb-option value="1">Option 1</nb-option>
+        <nb-option value="2">Option 2</nb-option>
+        <nb-option value="3">Option 3</nb-option>
+        <nb-option value="4">Option 4</nb-option>
+      </nb-option-group>
+
+      <nb-option-group title="Group 2">
+        <nb-option value="21">Option 21</nb-option>
+        <nb-option value="22">Option 22</nb-option>
+        <nb-option value="23">Option 23</nb-option>
+        <nb-option value="24">Option 24</nb-option>
+      </nb-option-group>
+
+      <nb-option-group title="Group 3">
+        <nb-option value="31">Option 31</nb-option>
+        <nb-option value="32">Option 32</nb-option>
+        <nb-option value="33">Option 33</nb-option>
+        <nb-option value="34">Option 34</nb-option>
+      </nb-option-group>
+
+    </nb-select>
+  </nb-card-body>
+
+  <nb-card-body>
+    <nb-select placeholder="Placeholder" status="primary">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+  </nb-card-body>
+
+  <nb-card-body class="select-disabled">
+    <nb-select disabled placeholder="Disabled">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Disabled Items">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2" disabled>Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4" disabled>Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Disabled Groups">
+
+      <nb-option-group title="Group 1">
+        <nb-option value="1">Option 1</nb-option>
+        <nb-option value="2" disabled>Option 2</nb-option>
+        <nb-option value="3">Option 3</nb-option>
+        <nb-option value="4">Option 4</nb-option>
+      </nb-option-group>
+
+      <nb-option-group title="Group 2" disabled>
+        <nb-option value="21">Option 21</nb-option>
+        <nb-option value="22">Option 22</nb-option>
+        <nb-option value="23">Option 23</nb-option>
+        <nb-option value="24">Option 24</nb-option>
+      </nb-option-group>
+
+      <nb-option-group title="Group 3">
+        <nb-option value="31">Option 31</nb-option>
+        <nb-option value="32">Option 32</nb-option>
+        <nb-option value="33">Option 33</nb-option>
+        <nb-option value="34">Option 34</nb-option>
+      </nb-option-group>
+
+    </nb-select>
+  </nb-card-body>
+
+  <nb-card-body>
+    <nb-select placeholder="Custom label" [(selected)]="selectedItem">
+      <nb-select-label>
+        Selected: {{ selectedItem }}
+      </nb-select-label>
+
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+  </nb-card-body>
+
+  <nb-card-body class="select-statuses">
+    <nb-select placeholder="Primary" status="primary">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Info" status="info">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Danger" status="danger">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Success" status="success">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Warning" status="warning">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+  </nb-card-body>
+
+  <nb-card-body class="select-sizes">
+    <nb-select placeholder="XSmall" size="xsmall">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Small" size="small">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Medium" size="medium">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Large" size="large">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+  </nb-card-body>
+
+  <nb-card-body class="select-outline">
+    <nb-select placeholder="Primary" outline status="primary">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Info" outline status="info">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Danger" outline status="danger">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Success" outline status="success">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Warning" outline status="warning">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+  </nb-card-body>
+
+  <nb-card-body class="select-color">
+    <nb-select placeholder="Primary" hero status="primary">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Info" hero status="info">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Danger" hero status="danger">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Success" hero status="success">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Warning" hero status="warning">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+  </nb-card-body>
+
+  <nb-card-body class="select-shape">
+    <nb-select placeholder="Round" shape="round">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Rectangle" shape="rectangle">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+
+    <nb-select placeholder="Semi-round" shape="semi-round">
+      <nb-option value="1">Option 1</nb-option>
+      <nb-option value="2">Option 2</nb-option>
+      <nb-option value="3">Option 3</nb-option>
+      <nb-option value="4">Option 4</nb-option>
+    </nb-select>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.scss b/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.scss
new file mode 100644
index 0000000000..45bfb3cf71
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.scss
@@ -0,0 +1,21 @@
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  nb-select {
+    display: block;
+    width: 15rem;
+  }
+
+  .select-form-binding,
+  .select-disabled,
+  .select-statuses,
+  .select-sizes,
+  .select-outline,
+  .select-color,
+  .select-shape {
+    nb-select {
+      margin-right: 0.75rem;
+      margin-bottom: 1rem;
+    }
+  }
+}
diff --git a/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.ts b/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.ts
new file mode 100644
index 0000000000..870bce900c
--- /dev/null
+++ b/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+import { FormControl } from '@angular/forms';
+
+@Component({
+  selector: 'ngx-nebular-select',
+  templateUrl: 'nebular-select.component.html',
+  styleUrls: ['nebular-select.component.scss'],
+})
+export class NebularSelectComponent {
+
+  commonSelectedItem = '2';
+
+  selectedItemNgModel;
+  selectedItemFormControl = new FormControl();
+
+  selectedItem;
+}
diff --git a/src/app/pages/nebular/infinite-list/infinite-list.component.html b/src/app/pages/nebular/infinite-list/infinite-list.component.html
new file mode 100644
index 0000000000..682c733a6d
--- /dev/null
+++ b/src/app/pages/nebular/infinite-list/infinite-list.component.html
@@ -0,0 +1,40 @@
+<nb-card>
+  <nb-card-header>Infinite List</nb-card-header>
+</nb-card>
+
+<div class="infinite-cards">
+  <nb-card class="own-scroll">
+    <nb-card-header>
+      Own scroll
+    </nb-card-header>
+    <nb-list
+      nbInfiniteList
+      [threshold]="500"
+      (bottomThreshold)="loadNext(firstCard)">
+      <nb-list-item *ngFor="let newsPost of firstCard.news">
+        <ngx-news-post [post]="newsPost"></ngx-news-post>
+      </nb-list-item>
+      <nb-list-item *ngFor="let _ of firstCard.placeholders">
+        <ngx-news-post-placeholder></ngx-news-post-placeholder>
+      </nb-list-item>
+    </nb-list>
+  </nb-card>
+
+  <nb-card>
+    <nb-card-header>
+      Window scroll
+    </nb-card-header>
+    <nb-list
+      nbInfiniteList
+      listenWindowScroll
+      [threshold]="500"
+      (bottomThreshold)="loadNext(secondCard)">
+      <nb-list-item *ngFor="let newsPost of secondCard.news">
+        <ngx-news-post [post]="newsPost"></ngx-news-post>
+      </nb-list-item>
+      <nb-list-item *ngFor="let _ of secondCard.placeholders">
+        <ngx-news-post-placeholder></ngx-news-post-placeholder>
+      </nb-list-item>
+    </nb-list>
+  </nb-card>
+</div>
diff --git a/src/app/pages/nebular/infinite-list/infinite-list.component.scss b/src/app/pages/nebular/infinite-list/infinite-list.component.scss
new file mode 100644
index 0000000000..c6a6ce6fc5
--- /dev/null
+++ b/src/app/pages/nebular/infinite-list/infinite-list.component.scss
@@ -0,0 +1,20 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  .infinite-cards {
+    display: flex;
+
+    nb-card {
+      flex: 1 1 45%;
+      margin-left: 2.5%;
+
+      &:first-child {
+        margin-left: 0;
+      }
+
+      &.own-scroll {
+        height: 50vh;
+      }
+    }
+  }
+}
diff --git a/src/app/pages/nebular/infinite-list/infinite-list.component.ts b/src/app/pages/nebular/infinite-list/infinite-list.component.ts
new file mode 100644
index 0000000000..fc9de880e8
--- /dev/null
+++ b/src/app/pages/nebular/infinite-list/infinite-list.component.ts
@@ -0,0 +1,41 @@
+import { Component } from '@angular/core';
+import { NewsService } from '../services/news.service';
+
+@Component({
+  selector: 'ngx-infinite-list',
+  templateUrl: 'infinite-list.component.html',
+  styleUrls: ['infinite-list.component.scss'],
+})
+export class InfiniteListComponent {
+
+
+  firstCard = {
+    news: [],
+    placeholders: [],
+    loading: false,
+    pageToLoadNext: 1,
+  };
+  secondCard = {
+    news: [],
+    placeholders: [],
+    loading: false,
+    pageToLoadNext: 1,
+  };
+  pageSize = 10;
+
+  constructor(private newsService: NewsService) {}
+
+  loadNext(cardData) {
+    if (cardData.loading) { return; }
+
+    cardData.loading = true;
+    cardData.placeholders = new Array(this.pageSize);
+    this.newsService.load(cardData.pageToLoadNext, this.pageSize)
+      .subscribe(nextNews => {
+        cardData.placeholders = [];
+        cardData.news.push(...nextNews);
+        cardData.loading = false;
+        cardData.pageToLoadNext++;
+      });
+  }
+}
diff --git a/src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.html b/src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.html
new file mode 100644
index 0000000000..47a3b3047c
--- /dev/null
+++ b/src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.html
@@ -0,0 +1,3 @@
+<div class="title-placeholder"></div>
+<div class="text-placeholder"></div>
+<div class="link-placeholder"></div>
diff --git a/src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.scss b/src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.scss
new file mode 100644
index 0000000000..7179965a7c
--- /dev/null
+++ b/src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.scss
@@ -0,0 +1,25 @@
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  display: block;
+
+  .title-placeholder {
+    height: 1.8rem;
+    margin-bottom: 0.5rem;
+    width: 80%;
+  }
+
+  .text-placeholder {
+    height: 4rem;
+    margin-bottom: 1rem;
+  }
+
+  .link-placeholder {
+    height: 1.25rem;
+    width: 5rem;
+  }
+
+  [class$='placeholder'] {
+    background: rgba(nb-theme(layout-bg), 0.6);
+  }
+}
diff --git a/src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.ts b/src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.ts
new file mode 100644
index 0000000000..cd6fbb3d46
--- /dev/null
+++ b/src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.ts
@@ -0,0 +1,12 @@
+import { Component, HostBinding } from '@angular/core';
+
+@Component({
+  selector: 'ngx-news-post-placeholder',
+  templateUrl: 'news-post-placeholder.component.html',
+  styleUrls: ['news-post-placeholder.component.scss'],
+})
+export class NewsPostPlaceholderComponent {
+
+  @HostBinding('attr.aria-label')
+  label = 'Loading';
+}
diff --git a/src/app/pages/nebular/infinite-list/news-post/news-post.component.html b/src/app/pages/nebular/infinite-list/news-post/news-post.component.html
new file mode 100644
index 0000000000..af5449da66
--- /dev/null
+++ b/src/app/pages/nebular/infinite-list/news-post/news-post.component.html
@@ -0,0 +1,5 @@
+<article>
+  <h2>{{post.title}}</h2>
+  <p>{{post.text}}</p>
+  <a [attr.href]="post.link">Read full article</a>
+</article>
diff --git a/src/app/pages/nebular/infinite-list/news-post/news-post.component.ts b/src/app/pages/nebular/infinite-list/news-post/news-post.component.ts
new file mode 100644
index 0000000000..800f61b49b
--- /dev/null
+++ b/src/app/pages/nebular/infinite-list/news-post/news-post.component.ts
@@ -0,0 +1,12 @@
+import { Component, Input } from '@angular/core';
+
+import { NewsPost } from '../../services/news.service';
+
+@Component({
+  selector: 'ngx-news-post',
+  templateUrl: 'news-post.component.html',
+})
+export class NewsPostComponent {
+
+  @Input() post: NewsPost;
+}
diff --git a/src/app/pages/nebular/list/fruits-list.ts b/src/app/pages/nebular/list/fruits-list.ts
new file mode 100644
index 0000000000..7bae676a28
--- /dev/null
+++ b/src/app/pages/nebular/list/fruits-list.ts
@@ -0,0 +1,13 @@
+export const fruits: string[] = [
+  'Lemons',
+  'Raspberries',
+  'Strawberries',
+  'Blackberries',
+  'Kiwis',
+  'Grapefruit',
+  'Avocado',
+  'Watermelon',
+  'Cantaloupe',
+  'Oranges',
+  'Peaches',
+];
diff --git a/src/app/pages/nebular/list/list.component.html b/src/app/pages/nebular/list/list.component.html
new file mode 100644
index 0000000000..e7adf0e393
--- /dev/null
+++ b/src/app/pages/nebular/list/list.component.html
@@ -0,0 +1,26 @@
+<nb-card>
+  <nb-card-header>List</nb-card-header>
+</nb-card>
+
+<div class="lists">
+  <nb-card class="list-card">
+    <nb-card-header>Some fruits</nb-card-header>
+    <nb-card-body>
+      <nb-list>
+        <nb-list-item *ngFor="let fruit of fruits">
+          {{ fruit }}
+        </nb-list-item>
+      </nb-list>
+    </nb-card-body>
+  </nb-card>
+
+  <nb-card class="list-card" size="small">
+    <nb-card-header>Users</nb-card-header>
+    <nb-list>
+      <nb-list-item *ngFor="let user of users">
+        <nb-user [name]="user.name" [title]="user.title">
+        </nb-user>
+      </nb-list-item>
+    </nb-list>
+  </nb-card>
+</div>
diff --git a/src/app/pages/nebular/list/list.component.scss b/src/app/pages/nebular/list/list.component.scss
new file mode 100644
index 0000000000..42d0316881
--- /dev/null
+++ b/src/app/pages/nebular/list/list.component.scss
@@ -0,0 +1,24 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  .lists {
+    display: flex;
+  }
+
+  .list-card {
+    width: 20rem;
+    margin-left: 10rem;
+
+    &:first-child {
+      margin-left: 0;
+    }
+
+    nb-card-header {
+      border-bottom: none;
+    }
+
+    nb-card-body {
+      padding: 0;
+    }
+  }
+}
diff --git a/src/app/pages/nebular/list/list.component.ts b/src/app/pages/nebular/list/list.component.ts
new file mode 100644
index 0000000000..8e5b29be75
--- /dev/null
+++ b/src/app/pages/nebular/list/list.component.ts
@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+import { fruits } from './fruits-list';
+
+@Component({
+  selector: 'ngx-list',
+  templateUrl: 'list.component.html',
+  styleUrls: ['list.component.scss'],
+})
+export class ListComponent {
+  fruits = fruits;
+
+  users: { name: string, title: string }[] = [
+    { name: 'Carla Espinosa', title: 'Nurse' },
+    { name: 'Bob Kelso', title: 'Doctor of Medicine' },
+    { name: 'Janitor', title: 'Janitor' },
+    { name: 'Perry Cox', title: 'Doctor of Medicine' },
+    { name: 'Ben Sullivan', title: 'Carpenter and photographer' },
+  ];
+}
diff --git a/src/app/pages/nebular/nebular-routing.module.ts b/src/app/pages/nebular/nebular-routing.module.ts
index cdee99eca4..8302efbd72 100644
--- a/src/app/pages/nebular/nebular-routing.module.ts
+++ b/src/app/pages/nebular/nebular-routing.module.ts
@@ -8,6 +8,13 @@ import { AccordionComponent } from './accordion/accordion.component';
 import { DatepickerComponent } from './datepicker/datepicker.component';
 import { DialogComponent } from './dialog/dialog.component';
 import { WindowComponent } from './window/window.component';
+import { ListComponent } from './list/list.component';
+import { InfiniteListComponent } from './infinite-list/infinite-list.component';
+import { ToastrComponent } from './toastr/toastr.component';
+import { AlertComponent } from './alert/alert.component';
+import { ProgressBarComponent } from './progress-bar/progress-bar.component';
+import { SpinnerComponent } from './spinner/spinner.component';
+import { NebularFormInputsComponent } from './form-inputs/nebular-form-inputs.component';
 
 const routes: Routes = [{
   path: '',
@@ -37,6 +44,34 @@ const routes: Routes = [{
       path: 'window',
       component: WindowComponent,
     },
+    {
+      path: 'list',
+      component: ListComponent,
+    },
+    {
+      path: 'infinite-list',
+      component: InfiniteListComponent,
+    },
+    {
+      path: 'toastr',
+      component: ToastrComponent,
+    },
+    {
+      path: 'alert',
+      component: AlertComponent,
+    },
+    {
+      path: 'progress-bar',
+      component: ProgressBarComponent,
+    },
+    {
+      path: 'spinner',
+      component: SpinnerComponent,
+    },
+    {
+      path: 'form-inputs',
+      component: NebularFormInputsComponent,
+    },
   ],
 }];
 
diff --git a/src/app/pages/nebular/nebular.module.ts b/src/app/pages/nebular/nebular.module.ts
index 2351917e60..6059d4d63e 100644
--- a/src/app/pages/nebular/nebular.module.ts
+++ b/src/app/pages/nebular/nebular.module.ts
@@ -17,12 +17,40 @@ import { NbDialogModule, NbWindowModule } from '@nebular/theme';
 import { DialogNamePromptComponent } from './dialog/dialog-name-prompt/dialog-name-prompt.component';
 import { WindowComponent } from './window/window.component';
 import { WindowFormComponent } from './window/window-form/window-form.component';
+import { ListComponent } from './list/list.component';
+import { InfiniteListComponent } from './infinite-list/infinite-list.component';
+import { ToastrComponent } from './toastr/toastr.component';
+import { AlertComponent } from './alert/alert.component';
+import { ProgressBarComponent } from './progress-bar/progress-bar.component';
+import {
+  InteractiveProgressBarComponent,
+} from './progress-bar/interactive-progress-bar/interactive-progress-bar.component';
+import { SpinnerComponent } from './spinner/spinner.component';
+import { SpinnerColorComponent } from './spinner/spinner-color/spinner-color.component';
+import { SpinnerSizesComponent } from './spinner/spinner-sizes/spinner-sizes.component';
+import { SpinnerInButtonsComponent } from './spinner/spinner-in-buttons/spinner-in-buttons.component';
+import { SpinnerInTabsComponent } from './spinner/spinner-in-tabs/spinner-in-tabs.component';
+import { NebularFormInputsComponent } from './form-inputs/nebular-form-inputs.component';
+import { NebularInputsComponent } from './form-inputs/nebular-inputs/nebular-inputs.component';
+import { NebularCheckboxComponent } from './form-inputs/nebular-checkbox/nebular-checkbox.component';
+import { NebularRadioGroupComponent } from './form-inputs/nebular-radio-group/nebular-radio-group.component';
+import { NebularSelectComponent } from './form-inputs/nebular-select/nebular-select.component';
+
+// services
+import { NewsService } from './services/news.service';
+import { NewsPostComponent } from './infinite-list/news-post/news-post.component';
+import { NewsPostPlaceholderComponent } from './infinite-list/news-post-placeholder/news-post-placeholder.component';
 
 const COMPONENTS = [
   NebularComponent,
   CalendarComponent,
   DayCellComponent,
   StepperComponent,
+  ListComponent,
+  InfiniteListComponent,
+  NewsPostComponent,
+  NewsPostPlaceholderComponent,
+  ToastrComponent,
   AccordionComponent,
   DatepickerComponent,
   DialogComponent,
@@ -30,6 +58,19 @@ const COMPONENTS = [
   DialogNamePromptComponent,
   WindowComponent,
   WindowFormComponent,
+  AlertComponent,
+  ProgressBarComponent,
+  InteractiveProgressBarComponent,
+  SpinnerComponent,
+  SpinnerColorComponent,
+  SpinnerSizesComponent,
+  SpinnerInButtonsComponent,
+  SpinnerInTabsComponent,
+  NebularFormInputsComponent,
+  NebularInputsComponent,
+  NebularCheckboxComponent,
+  NebularRadioGroupComponent,
+  NebularSelectComponent,
 ];
 
 const ENTRY_COMPONENTS = [
@@ -38,7 +79,6 @@ const ENTRY_COMPONENTS = [
   WindowFormComponent,
 ];
 
-
 const MODULES = [
   ThemeModule,
   NebularRoutingModule,
@@ -46,6 +86,10 @@ const MODULES = [
   NbWindowModule.forChild(),
 ];
 
+const SERVICES = [
+  NewsService,
+];
+
 @NgModule({
   imports: [
     ...MODULES,
@@ -53,6 +97,9 @@ const MODULES = [
   declarations: [
     ...COMPONENTS,
   ],
+  providers: [
+    ...SERVICES,
+  ],
   entryComponents: [
     ...ENTRY_COMPONENTS,
   ],
diff --git a/src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html b/src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html
new file mode 100644
index 0000000000..11c26e512a
--- /dev/null
+++ b/src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html
@@ -0,0 +1,14 @@
+<nb-card>
+  <nb-card-header>Progress Bar Interactive</nb-card-header>
+  <nb-card-body>
+    <div class="container">
+      <nb-actions size="medium">
+        <nb-action icon="nb-arrow-down" (click)="setValue(value - 25)"></nb-action>
+      </nb-actions>
+      <nb-progress-bar [value]="value" [status]="status" [displayValue]="true"></nb-progress-bar>
+      <nb-actions size="medium">
+        <nb-action icon="nb-arrow-up" (click)="setValue(value + 25)"></nb-action>
+      </nb-actions>
+    </div>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss b/src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss
new file mode 100644
index 0000000000..7d6cf13b63
--- /dev/null
+++ b/src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss
@@ -0,0 +1,12 @@
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  .container {
+    display: flex;
+    align-items: center;
+  }
+
+  nb-progress-bar {
+    flex: 1;
+  }
+}
diff --git a/src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts b/src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts
new file mode 100644
index 0000000000..fc39042e62
--- /dev/null
+++ b/src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-interactive-progress-bar',
+  templateUrl: 'interactive-progress-bar.component.html',
+  styleUrls: ['interactive-progress-bar.component.scss'],
+})
+export class InteractiveProgressBarComponent {
+
+  value = 25;
+
+  setValue(newValue) {
+    this.value = Math.min(Math.max(newValue, 0), 100);
+  }
+
+  get status(){
+    if (this.value <= 25) {
+      return 'danger';
+    } else if (this.value <= 50) {
+      return 'warning';
+    } else if (this.value <= 75) {
+      return 'info';
+    } else {
+      return 'success';
+    }
+  }
+}
diff --git a/src/app/pages/nebular/progress-bar/progress-bar.component.html b/src/app/pages/nebular/progress-bar/progress-bar.component.html
new file mode 100644
index 0000000000..cbfa21ed4c
--- /dev/null
+++ b/src/app/pages/nebular/progress-bar/progress-bar.component.html
@@ -0,0 +1,38 @@
+<nb-card>
+  <nb-card-header>Progress Bar</nb-card-header>
+</nb-card>
+<div class="row">
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <nb-card>
+      <nb-card-header>Progress Bar Status</nb-card-header>
+      <nb-card-body>
+        <nb-progress-bar [value]="20" status="primary">primary</nb-progress-bar>
+        <nb-progress-bar [value]="40" status="info">info</nb-progress-bar>
+        <nb-progress-bar [value]="60" status="success">success</nb-progress-bar>
+        <nb-progress-bar [value]="80" status="warning">warning</nb-progress-bar>
+        <nb-progress-bar [value]="100" status="danger">danger</nb-progress-bar>
+      </nb-card-body>
+    </nb-card>
+    <ngx-interactive-progress-bar></ngx-interactive-progress-bar>
+  </div>
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <nb-card>
+      <nb-card-header>Progress Bar Size</nb-card-header>
+      <nb-card-body>
+        <nb-progress-bar [value]="20" size="xs">xs</nb-progress-bar>
+        <nb-progress-bar [value]="40" size="sm">sm</nb-progress-bar>
+        <nb-progress-bar [value]="60">none</nb-progress-bar>
+        <nb-progress-bar [value]="80" size="lg">lg</nb-progress-bar>
+        <nb-progress-bar [value]="100" size="xlg">xlg</nb-progress-bar>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-card>
+      <nb-card-header>Progress Bar Value</nb-card-header>
+      <nb-card-body>
+        <nb-progress-bar [value]="40" status="primary" [displayValue]="true"></nb-progress-bar>
+        <nb-progress-bar [value]="60" status="primary">Custom value</nb-progress-bar>
+      </nb-card-body>
+    </nb-card>
+  </div>
+</div>
diff --git a/src/app/pages/nebular/progress-bar/progress-bar.component.scss b/src/app/pages/nebular/progress-bar/progress-bar.component.scss
new file mode 100644
index 0000000000..3fdcd62254
--- /dev/null
+++ b/src/app/pages/nebular/progress-bar/progress-bar.component.scss
@@ -0,0 +1,7 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  nb-progress-bar ~ nb-progress-bar {
+    margin-top: 1rem;
+  }
+}
diff --git a/src/app/pages/nebular/progress-bar/progress-bar.component.ts b/src/app/pages/nebular/progress-bar/progress-bar.component.ts
new file mode 100644
index 0000000000..03f4fe6e7f
--- /dev/null
+++ b/src/app/pages/nebular/progress-bar/progress-bar.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-progress-bar',
+  templateUrl: 'progress-bar.component.html',
+  styleUrls: ['progress-bar.component.scss'],
+})
+export class ProgressBarComponent {
+
+}
diff --git a/src/app/pages/nebular/services/news.service.ts b/src/app/pages/nebular/services/news.service.ts
new file mode 100644
index 0000000000..0ec96c5f51
--- /dev/null
+++ b/src/app/pages/nebular/services/news.service.ts
@@ -0,0 +1,30 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { delay, map } from 'rxjs/operators';
+
+const TOTAL_PAGES = 7;
+
+export class NewsPost {
+  title: string;
+  link: string;
+  creator: string;
+  text: string;
+}
+
+@Injectable()
+export class NewsService {
+
+  constructor(private http: HttpClient) {}
+
+  load(page: number, pageSize: number): Observable<NewsPost[]> {
+    const startIndex = ((page - 1) % TOTAL_PAGES) * pageSize;
+
+    return this.http
+      .get<NewsPost[]>('assets/data/news.json')
+      .pipe(
+        map(news => news.splice(startIndex, pageSize)),
+        delay(1500),
+      );
+  }
+}
diff --git a/src/app/pages/nebular/spinner/spinner-color/spinner-color.component.html b/src/app/pages/nebular/spinner/spinner-color/spinner-color.component.html
new file mode 100644
index 0000000000..7a4a2646bd
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner-color/spinner-color.component.html
@@ -0,0 +1,44 @@
+<nb-card>
+  <nb-card-header>Spinner Color</nb-card-header>
+</nb-card>
+<nb-card [nbSpinner]="true" nbSpinnerStatus="active">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerStatus="disabled">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerStatus="warning">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerStatus="danger">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerStatus="success">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerStatus="info">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerStatus="primary">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/nebular/spinner/spinner-color/spinner-color.component.ts b/src/app/pages/nebular/spinner/spinner-color/spinner-color.component.ts
new file mode 100644
index 0000000000..b2faf32371
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner-color/spinner-color.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-spinner-color',
+  templateUrl: 'spinner-color.component.html',
+})
+
+export class SpinnerColorComponent {
+}
diff --git a/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.html b/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.html
new file mode 100644
index 0000000000..4a804144c0
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.html
@@ -0,0 +1,39 @@
+<nb-card accent="primary" size="small">
+  <nb-card-header>Button With Spinner</nb-card-header>
+  <nb-card-body>
+    <div class="d-flex align-items-start">
+      <div class="size-large-group">
+        <button nbButton status="success" size="large" (click)="toggleLoadingAnimation()"
+                [nbSpinner]="loading" nbSpinnerStatus="success" nbSpinnerSize="large" nbSpinnerMessage="">
+          Download
+        </button>
+
+        <button nbButton status="primary" size="large" (click)="toggleLoadingAnimation()"
+                [nbSpinner]="loading" nbSpinnerStatus="primary" nbSpinnerSize="large" nbSpinnerMessage="">
+          Download
+        </button>
+
+        <button nbButton status="warning" size="large" (click)="toggleLoadingAnimation()"
+                [nbSpinner]="loading" nbSpinnerStatus="warning" nbSpinnerSize="large" nbSpinnerMessage="">
+          Download
+        </button>
+      </div>
+      <div class="size-medium-group">
+        <button nbButton status="danger" size="medium" (click)="toggleLoadingAnimation()"
+                [nbSpinner]="loading" nbSpinnerStatus="danger" nbSpinnerMessage="">
+          Download
+        </button>
+
+        <button nbButton status="info" size="medium" (click)="toggleLoadingAnimation()"
+                [nbSpinner]="loading" nbSpinnerStatus="info" nbSpinnerSize="small" nbSpinnerMessage="">
+          Download
+        </button>
+
+        <button nbButton status="info" size="medium" (click)="toggleLoadingAnimation()"
+                [nbSpinner]="loading" nbSpinnerStatus="info" nbSpinnerSize="xsmall" nbSpinnerMessage="">
+          Download
+        </button>
+      </div>
+    </div>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.scss b/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
new file mode 100644
index 0000000000..d6028d3e5c
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
@@ -0,0 +1,7 @@
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  button {
+    margin: 1rem;
+  }
+}
diff --git a/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.ts b/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.ts
new file mode 100644
index 0000000000..0bd553c7a1
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-spinner-in-buttons',
+  templateUrl: 'spinner-in-buttons.component.html',
+  styleUrls: ['spinner-in-buttons.component.scss'],
+})
+
+export class SpinnerInButtonsComponent {
+
+  loading = false;
+
+  toggleLoadingAnimation() {
+    this.loading = true;
+    setTimeout(() => this.loading = false, 3000);
+  }
+}
diff --git a/src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.html b/src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.html
new file mode 100644
index 0000000000..bb9a73c72e
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.html
@@ -0,0 +1,20 @@
+<nb-card size="xsmall">
+  <nb-card-body>
+    <nb-tabset fullWidth (changeTab)="toggleLoadingAnimation()">
+      <nb-tab tabTitle="Tab 1" [nbSpinner]="loading" nbSpinnerStatus="success" nbSpinnerSize="xxlarge">
+        <p>
+          A nebula is an interstellar cloud of dust, hydrogen, helium and other ionized gases.
+          Originally, nebula was a name for any diffuse astronomical object.
+        </p>
+      </nb-tab>
+
+      <nb-tab tabTitle="Tab 2" [nbSpinner]="loading" nbSpinnerStatus="info" nbSpinnerSize="xxlarge">
+        <p>
+          Nebular's primary goal is to assemble together and connect the most awesome features and libraries
+          creating an efficient ecosystem to speed up and simplify the development.
+        </p>
+      </nb-tab>
+
+    </nb-tabset>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.scss b/src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.scss
new file mode 100644
index 0000000000..17bf08e4cd
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.scss
@@ -0,0 +1,7 @@
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  nb-tab {
+    padding: 1.25rem;
+  }
+}
diff --git a/src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.ts b/src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.ts
new file mode 100644
index 0000000000..c9eb751fd9
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-spinner-in-tabs',
+  templateUrl: 'spinner-in-tabs.component.html',
+  styleUrls: ['spinner-in-tabs.component.scss'],
+})
+
+export class SpinnerInTabsComponent {
+
+  loading = false;
+
+  toggleLoadingAnimation() {
+    this.loading = true;
+    setTimeout(() => this.loading = false, 1000);
+  }
+}
diff --git a/src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.html b/src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.html
new file mode 100644
index 0000000000..71ddd11572
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.html
@@ -0,0 +1,44 @@
+<nb-card>
+  <nb-card-header>Spinner Sizes</nb-card-header>
+</nb-card>
+<nb-card [nbSpinner]="true" nbSpinnerSize="xxsmall">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerSize="xsmall">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerSize="small">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerSize="medium">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerSize="large">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerSize="xlarge">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerSize="xxlarge">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.ts b/src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.ts
new file mode 100644
index 0000000000..fb968dcb69
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-spinner-sizes',
+  templateUrl: 'spinner-sizes.component.html',
+})
+
+export class SpinnerSizesComponent {
+}
diff --git a/src/app/pages/nebular/spinner/spinner.component.html b/src/app/pages/nebular/spinner/spinner.component.html
new file mode 100644
index 0000000000..974d093c74
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner.component.html
@@ -0,0 +1,17 @@
+<nb-card>
+  <nb-card-header>Spinner</nb-card-header>
+</nb-card>
+<div class="row">
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <ngx-spinner-sizes></ngx-spinner-sizes>
+  </div>
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <ngx-spinner-color></ngx-spinner-color>
+  </div>
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <ngx-spinner-in-buttons></ngx-spinner-in-buttons>
+  </div>
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <ngx-spinner-in-tabs></ngx-spinner-in-tabs>
+  </div>
+</div>
diff --git a/src/app/pages/nebular/spinner/spinner.component.scss b/src/app/pages/nebular/spinner/spinner.component.scss
new file mode 100644
index 0000000000..0ffe71f956
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner.component.scss
@@ -0,0 +1,11 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  button {
+    margin: 1rem;
+  }
+
+  /deep/ nb-spinner {
+    z-index: 999;
+  }
+}
diff --git a/src/app/pages/nebular/spinner/spinner.component.ts b/src/app/pages/nebular/spinner/spinner.component.ts
new file mode 100644
index 0000000000..95b183a5a2
--- /dev/null
+++ b/src/app/pages/nebular/spinner/spinner.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-spinner',
+  templateUrl: 'spinner.component.html',
+  styleUrls: ['spinner.component.scss'],
+})
+
+export class SpinnerComponent {
+
+  loading = false;
+
+  toggleLoadingAnimation() {
+    this.loading = true;
+    setTimeout(() => this.loading = false, 3000);
+  }
+}
diff --git a/src/app/pages/nebular/toastr/toastr.component.html b/src/app/pages/nebular/toastr/toastr.component.html
new file mode 100644
index 0000000000..beef652c4c
--- /dev/null
+++ b/src/app/pages/nebular/toastr/toastr.component.html
@@ -0,0 +1,3 @@
+<nb-card>
+  <nb-card-header>Toastr</nb-card-header>
+</nb-card>
diff --git a/src/app/pages/nebular/toastr/toastr.component.scss b/src/app/pages/nebular/toastr/toastr.component.scss
new file mode 100644
index 0000000000..d5badf91b4
--- /dev/null
+++ b/src/app/pages/nebular/toastr/toastr.component.scss
@@ -0,0 +1,5 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+
+}
diff --git a/src/app/pages/nebular/toastr/toastr.component.ts b/src/app/pages/nebular/toastr/toastr.component.ts
new file mode 100644
index 0000000000..1dfd05a776
--- /dev/null
+++ b/src/app/pages/nebular/toastr/toastr.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-toastr',
+  templateUrl: 'toastr.component.html',
+  styleUrls: ['toastr.component.scss'],
+})
+export class ToastrComponent {
+
+}
diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts
index 7575482efa..592cbfb597 100644
--- a/src/app/pages/pages-menu.ts
+++ b/src/app/pages/pages-menu.ts
@@ -44,6 +44,34 @@ export const MENU_ITEMS: NbMenuItem[] = [
         title: 'Window',
         link: '/pages/nebular/window',
       },
+      {
+        title: 'List',
+        link: '/pages/nebular/list',
+      },
+      {
+        title: 'Infinite List',
+        link: '/pages/nebular/infinite-list',
+      },
+      {
+        title: 'Toastr',
+        link: '/pages/nebular/toastr',
+      },
+      {
+        title: 'Alert',
+        link: '/pages/nebular/alert',
+      },
+      {
+        title: 'Progress Bar',
+        link: '/pages/nebular/progress-bar',
+      },
+      {
+        title: 'Spinner',
+        link: '/pages/nebular/spinner',
+      },
+      {
+        title: 'Form Inputs',
+        link: '/pages/nebular/form-inputs',
+      },
     ],
   },
   {
diff --git a/src/assets/data/news.json b/src/assets/data/news.json
new file mode 100644
index 0000000000..919b28de08
--- /dev/null
+++ b/src/assets/data/news.json
@@ -0,0 +1,352 @@
+[
+  {
+    "title": "Fan of Angular-In-Depth and my writings? Support us on Twitter!",
+    "link": "https://blog.angularindepth.com/fan-of-angular-in-depth-and-my-writings-support-us-on-twitter-e3bfcbabb4b1",
+    "text": "A few weeks ago I ran a poll on Twitter to understand why Angular account has 280k followers on Twitter while Angular-In-Depth has only a fraction of that on Medium (11k). The poll showed that 50% of those who responded don’t use Medium, 17% find stories too complicated, 27% have no time to read and there are people (7%) who find stories not interesting."
+  },
+  {
+    "title": "Boosting performance of Angular applications with manual change detection",
+    "link": "https://blog.angularindepth.com/boosting-performance-of-angular-applications-with-manual-change-detection-42cb396110fb",
+    "text": "Angular uses NgZone/Zone.js to know when to trigger UI update (change detection) when our app data state changes. It brilliantly utilized the events emitted by Zone.js when async operations are performed to detect when to run a change detection cycle."
+  },
+  {
+    "title": "Learn how Angular Elements transmits Component’s @Outputs outside Angular",
+    "link": "https://blog.angularindepth.com/how-angular-elements-uses-custom-events-mechanism-to-transmit-components-outputs-outside-angular-7b469386f6e2",
+    "text": "In our last article we described how Angular Elements works under the hood. We identified that Angular Elements is a bridge to connect Custom Elements to Angular Components."
+  },
+  {
+    "title": "Angular CDK Tables",
+    "link": "https://blog.angularindepth.com/angular-cdk-tables-1537774d7c99",
+    "text": "In this article: Angular CDK Tables, Bootstrap 4 with Angular CDK Tables, Client Side searching/paging/sorting."
+  },
+  {
+    "title": "One-way template expression binding mechanism in Angular",
+    "link": "https://blog.angularindepth.com/becoming-an-angular-environmentalist-45a48f7c20d8",
+    "text": "Angular is the most popular and widely used JavaScript framework after React.js. It abstracts many complexities away from developers to enable them to develop apps with ease."
+  },
+  {
+    "title": "The Extensive Guide to Creating Streams in RxJS",
+    "link": "https://blog.angularindepth.com/how-to-unit-test-angular-components-with-fake-ngrx-teststore-f0500cc5fc26",
+    "text": "For most developers the first contact with RxJS is established by libraries, like Angular. Some functions return streams and to make use of them the focus naturally is on operators."
+  },
+  {
+    "title": "RxJS: Avoiding Unbound Methods",
+    "link": "https://blog.angularindepth.com/rxjs-avoiding-unbound-methods-fcf2648a805",
+    "text": "When unbound methods are passed to RxJS, they will be invoked with an unexpected context for this. If the method implementations don’t use this, they will behave as you would expect."
+  },
+  {
+    "title": "Angular Elements: how does this magic work under the hood?",
+    "link": "https://blog.angularindepth.com/angular-elements-how-does-this-magic-work-under-the-hood-3684a0b2be95",
+    "text": "The Angular Elements project is generating lots of hype in the community right now, and rightly so! Angular Elements provides a wealth of awesome features out of the box."
+  },
+  {
+    "title": "RxJS: Testing with Fake Time",
+    "link": "https://blog.angularindepth.com/rxjs-testing-with-fake-time-94114271eed2",
+    "text": "Angular, Jasmine, Jest and Sinon.JS all provide APIs for running tests with fake time. Their APIs differ, but they are broadly similar. Running tests with fake time avoids having to wait for actual time to elapse and it also makes the tests much simpler, as they run synchronously. So what does this have to do with RxJS?"
+  },
+  {
+    "title": "How do CDK Portals work?",
+    "link": "https://blog.angularindepth.com/how-do-cdk-portals-work-7c097c14a494",
+    "text": "In the last article we were exploring how to leverage the Angular Material CDK portals for placing some piece of template from a component to some other location within our app. CDK portals make this a no-brainer. Wondering how they work? In this article we dive deeper to uncover how its internals work and how we could simply implement it by ourselves."
+  },
+  {
+    "title": "How I test my NgRx selectors",
+    "link": "https://blog.angularindepth.com/how-i-test-my-ngrx-selectors-c50b1dc556bc",
+    "text": "In this post I’m going to show you how I test my selectors by putting the selectors from a previous post “Clean NgRx reducers using Immer”, where we created a small shopping cart application, under test. In the application there is a collection of products (the catalog) and the cart items, together they form the state of the application."
+  },
+  {
+    "title": "Angular 5 or Angular 6? Yes please!",
+    "link": "https://blog.angularindepth.com/angular-5-or-angular-6-yes-please-d71b08b5e59b",
+    "text": "And, I’m glad you asked: YES, you should move all your projects to Angular 6 now or sooner! But … and it is a big but. Like me, you may be in the situation where you are working on multiple projects and many of them are going to be stuck in Angular 5 for a while. So, you need to support a development environment where you can work on and even create new Angular applications in both Angular 5 and Angular 6."
+  },
+  {
+    "title": "Total Guide To Dynamic Angular Animations That Can Be Customized At Runtime",
+    "link": "https://blog.angularindepth.com/total-guide-to-dynamic-angular-animations-that-can-be-toggled-at-runtime-be5bb6778a0a",
+    "text": "From route transitions to small details like feedback when clicking on a button or displaying a tooltip, animations give your project that nice sleek look. Well crafted animations communicate that you or your organization care enough to put effort into details and create best possible experience for your users."
+  },
+  {
+    "title": "RxJS: How to Observe an Object",
+    "link": "https://blog.angularindepth.com/rxjs-how-to-observe-an-object-20c47cf51571",
+    "text": "A while ago, John Lindquist published a package named rx-handler. With it, you can create event handler functions that are also observables. When it was published, I noticed a few queries about whether something similar could be done with Angular’s Input properties — so that they, too, could be treated as observables."
+  },
+  {
+    "title": "A curious case of the @Host decorator and Element Injectors in Angular",
+    "link": "https://blog.angularindepth.com/a-curios-case-of-the-host-decorator-and-element-injectors-in-angular-582562abcf0a",
+    "text": "As you know, Angular’s dependency injection mechanism includes a bunch of decorators like @Optional and @Self which impact the way dependencies are resolved. And while most of them are pretty straightforward and self-explanatory, the @Host decorator has puzzled me for a long time."
+  },
+  {
+    "title": "Simple state mutations in NGXS with Immer",
+    "link": "https://blog.angularindepth.com/simple-state-mutations-in-ngxs-with-immer-48b908874a5e",
+    "text": "NGXS is a state management pattern + library for Angular. Just like Redux and NgRx it’s modeled after the CQRS pattern. NGXS uses TypeScript functionality to its fullest extent and because of this it may feel more Angular-y."
+  },
+  {
+    "title": "Upgrading a project without CLI to Angular 6",
+    "link": "https://blog.angularindepth.com/upgrading-a-project-without-cli-to-angular-6-b07b105adc02",
+    "text": "In the following article, I’m going to describe the challenging process of updating an Angular application with custom Webpack configuration, which our team had to pull through 3 weeks ago. I guess our experience would be useful for those who use Angular with acustom Webpack config. For others, it is an illustration of where modern front-end could lead us and how to live with that."
+  },
+  {
+    "title": "Power of RxJS when using exponential backoff",
+    "link": "https://blog.angularindepth.com/power-of-rxjs-when-using-exponential-backoff-a4b8bde276b0",
+    "text": "Most of the modern-day Angular web apps make Ajax requests to the servers. These requests involve multiple network components (such as routers, switches, etc) as well as servers’ state and everything has to go just right for them to succeed. However, sometimes it doesn’t."
+  },
+  {
+    "title": "Clean NgRx reducers using Immer",
+    "link": "https://blog.angularindepth.com/clean-ngrx-reducers-using-immer-7fe4a0d43508",
+    "text": "This weeks post is inspired by another great This Dot Media event and the topic this time was state management. There was a small segment about Immer which I found interesting (video is linked at the bottom of this post), so I decided to give it a shot with NgRx."
+  },
+  {
+    "title": "The Angular Library Series - Creating a Library with the Angular CLI",
+    "link": "https://blog.angularindepth.com/creating-a-library-in-angular-6-87799552e7e5",
+    "text": "Angular 6 was just released. Many of the improvements were to the Angular CLI. The one I have really been looking forward to is the integration of the Angular CLI with ng-packagr to generate and build Angular libraries. ng-packagr is a fantastic tool created by David Herges that transpiles your library to the Angular Package Format."
+  },
+  {
+    "title": "RxJS: Avoiding takeUntil Leaks",
+    "link": "https://blog.angularindepth.com/rxjs-avoiding-takeuntil-leaks-fb5182d047ef",
+    "text": "Using the takeUntil operator to automatically unsubscribe from an observable is a mechanism that’s explained in Ben Lesh’s Don’t Unsubscribe article. It’s also the basis of a generally-accepted pattern for unsubscribing upon an Angular component’s destruction."
+  },
+  {
+    "title": "Use <ng-template>",
+    "link": "https://blog.angularindepth.com/use-ng-template-c72852c37fba",
+    "text": "Render Props have been making waves in the React community recently, but the corresponding pattern in the Angular world hasn’t been getting nearly as much press. I’ve written before that TemplateRefs are Angular’s Render Props and I hope to give you a good simple example of that here."
+  },
+  {
+    "title": "RxJS: Improving the Static pipe Function",
+    "link": "https://blog.angularindepth.com/rxjs-improving-the-static-pipe-function-81146fbb14b6",
+    "text": "My previous article looked at using the static pipe function to compose reusable combinations of operators. Most of the time, the pipe function’s TypeScript overload signatures will infer the desired type for the returned function. However, sometimes it’s desirable to have a generic type inferred and the current overload signatures will not do that."
+  },
+  {
+    "title": "Angular Ivy change detection execution: are you prepared?",
+    "link": "https://blog.angularindepth.com/angular-ivy-change-detection-execution-are-you-prepared-ab68d4231f2c",
+    "text": "While new Ivy renderer is not feature completely yet, many people wonder how it will work and what changes it prepares for us. In this article I am going to visualize Ivy change detection mechanism, show some things I am really excited about and also build simple app based on instructions, similar to angular Ivy instructions, from scratch."
+  },
+  {
+    "title": "Ivy engine in Angular: first in-depth look at compilation, runtime and change detection",
+    "link": "https://blog.angularindepth.com/ivy-engine-in-angular-first-in-depth-look-at-compilation-runtime-and-change-detection-876751edd9fd",
+    "text": "I usually finish my talks with the philosophical phrase that nothing stays the same. And as you probably know it’s more then true with Angular. The current rendering engine is being rewritten with the new much enhanced version called Ivy. The current status of Ivy can be tracked here."
+  },
+  {
+    "title": "RxJS: Combining Operators",
+    "link": "https://blog.angularindepth.com/rxjs-combining-operators-397bad0628d0",
+    "text": "In version 5.5, pipeable operators were added to RxJS. And in version 6, their non-pipeable namesakes were removed. Pipeable operators have numerous advantages. The most obvious is that they are easier to write. A less obvious advantage is that they can be composed into reusable combinations."
+  },
+  {
+    "title": "A modern solution to lazy loading images using Intersection Observer",
+    "link": "https://blog.angularindepth.com/a-modern-solution-to-lazy-loading-using-intersection-observer-9280c149bbc",
+    "text": "Performance of a web application has become a key factor in deciding conversion rates for e-commerce websites. The faster a page loads, the better the conversion rate. According to the recent mobile page speed benchmarks released by Google, the bounce probability increases as page load time increases."
+  },
+  {
+    "title": "Working with DOM in Angular: unexpected consequences and optimization techniques",
+    "link": "https://blog.angularindepth.com/working-with-dom-in-angular-unexpected-consequences-and-optimization-techniques-682ac09f6866",
+    "text": "I recently gave a talk on advanced DOM manipulations in Angular in a form of a workshop at NgConf. I went from the basics like using template references and DOM queries to access DOM elements to using a view container to render templates and components dynamically."
+  },
+  {
+    "title": "The benefits of application state normalization in Angular",
+    "link": "https://blog.angularindepth.com/the-benefits-of-application-state-normalization-in-angular-f93392ca9f44",
+    "text": "Imagine we have a recursive data structure in the store, let us say, information about a product’s category in an e-commerce application. Category is the classification of which type of product it is. For example, Mobile Phones category can have subcategories such as Google, Apple, Samsung and so on and each subcategory can in turn have further subcategories..."
+  },
+  {
+    "title": "RxJS: TSLint Rules for Version 6",
+    "link": "https://blog.angularindepth.com/rxjs-tslint-rules-for-version-6-d10e2482292d",
+    "text": "Earlier this week, RxJS version 6 was released and, with its release, managing RxJS imports has become much, much easier. Last year, I wrote a bunch of TSLint rules for managing RxJS imports. They’re distributed in the rxjs-tslint-rules package."
+  },
+  {
+    "title": "Angular Universal & Firebase functions: The missing guide",
+    "link": "https://blog.angularindepth.com/angular-5-universal-firebase-4c85a7d00862",
+    "text": "Lucky you, I’ve written this simplified guide to configure Angular 5 Universal in your Angular project. Moreover, I’m gonna give you also a bonus track on how to run Universal in a serverless environment like Firebase Cloud Functions."
+  },
+  {
+    "title": "Angular and Internet Explorer",
+    "link": "https://blog.angularindepth.com/angular-and-internet-explorer-5e59bb6fb4e9",
+    "text": "You installed the Angular CLI and used it to generate your new application. But, when you try to view it in Internet Explorer (IE), you see nothing. Now what? The bad news: Angular CLI applications require a few more steps in order to support Internet Explorer."
+  },
+  {
+    "title": "Gestures in an Angular Application",
+    "link": "https://blog.angularindepth.com/gestures-in-an-angular-application-dde71804c0d0",
+    "text": "In this post I will attempt to explain how to use hammerjs gesture recognizers provided by the @angular/platform-browser package. I’ll be referencing @angular/platform-browser@5.2.0 within my code samples, but there are some changes coming to 6.0.0 that will be discussed later."
+  },
+  {
+    "title": "Deploy an Angular Application to IIS",
+    "link": "https://blog.angularindepth.com/deploy-an-angular-application-to-iis-60a0897742e7",
+    "text": "The Angular Router is a fantastic module for Single Page Apps. However, to deploy it in a Production scenario you will typically need to do some configuration to make it work. This article details the steps necessary to deploy an Angular Router application anywhere on Internet Information Services (IIS)."
+  },
+  {
+    "title": "Super Charging an Angular CLI App",
+    "link": "https://blog.angularindepth.com/super-charging-an-angular-cli-app-fc496a6c100",
+    "text": "A standard Angular CLI application comes with a terrific set of of tooling to prepare you to get developing quickly. However, there’s a few additional steps you should take to really prepare your project for success. In this article I’ll break down all the additional features you can add to your project without ejecting (exporting the WebPack Config)."
+  },
+  {
+    "title": "What you always wanted to know about Angular Dependency Injection tree",
+    "link": "https://blog.angularindepth.com/angular-dependency-injection-and-tree-shakeable-tokens-4588a8f70d5d",
+    "text": "If you didn’t dive deep into angular dependency injection mechanism, your mental model should be that in angular application we have some root injector with all merged providers, every component has its own injector and lazy loaded module introduces new injector."
+  },
+  {
+    "title": "RxJS: When to Use switchMap",
+    "link": "https://blog.angularindepth.com/when-to-use-switchmap-dfe84ac5a1ff",
+    "text": "In a response to RxJS: Avoiding switchMap-Related Bugs, Martin Hochel mentioned a classic use case for switchMap. For the use case to which he referred, switchMap is not only valid; it’s optimal. And it’s worth looking at why."
+  },
+  {
+    "title": "RxJS: Understanding Expand",
+    "link": "https://blog.angularindepth.com/rxjs-understanding-expand-a5f8b41a3602",
+    "text": "RxJS has a lot of operators. Lots and lots of them. It takes time to learn what they all do and how they can be used. Some operators are straightforward; others, less so. One operator that developers often find confusing is expand."
+  },
+  {
+    "title": "RxJS: Composing Subscriptions",
+    "link": "https://blog.angularindepth.com/rxjs-composing-subscriptions-b53ab22f1fd5",
+    "text": "RxJS code involves making subscriptions to observables. Lots of subscriptions. If each subscription is assigned to its own variable or property, the situation can be difficult to manage."
+  },
+  {
+    "title": "Handle Template Reference Variables with Directives",
+    "link": "https://blog.angularindepth.com/handle-template-reference-variables-with-directives-223081bc70c2",
+    "text": "I’ve been using template reference variables pretty liberally in my examples so far, and it’s high time I dive in a bit into how to use them to reference specific directives."
+  },
+  {
+    "title": "Avoid Namespace Clashes with Directives",
+    "link": "https://blog.angularindepth.com/avoid-namespace-clashes-with-directives-1f00d62de445",
+    "text": "Not only can the selector for a directive clash with another directive, but Inputs and Outputs for those directives can clash with each other. When they have the same name, Angular doesn’t complain — it just applies the logic to both directives. In some cases, this is exactly what we want. However, sometimes it can cause unexpected behavior."
+  },
+  {
+    "title": "Dynamically Loading Components with Angular CLI",
+    "link": "https://blog.angularindepth.com/dynamically-loading-components-with-angular-cli-92a3c69bcd28",
+    "text": "When moving from a multi-page application to a SPA, one of the problems that presents itself is the payload size upon initial load. By default, in an Angular application everything is bundled into one payload, which means as the application grows, so does the time that it takes to load."
+  },
+  {
+    "title": "Insider’s guide into interceptors and HttpClient mechanics in Angular",
+    "link": "https://blog.angularindepth.com/insiders-guide-into-interceptors-and-httpclient-mechanics-in-angular-103fbdb397bf",
+    "text": "You probably know that Angular introduced a new powerful HTTP client in version 4.3. One of its major features was request interception — the ability to declare interceptors which sit in between your application and the backend."
+  },
+  {
+    "title": "Enhance Components with Directives",
+    "link": "https://blog.angularindepth.com/enhance-components-with-directives-58f16c4ca1f",
+    "text": "One element of part 4 of Kent C. Dodds’ series that I didn’t touch on in the previous article is the fact that the withToggle higher order component is able to pull common logic out of the <toggle-on>, <toggle-off>, and <toggle-button> components. There wasn’t very much logic happening in those components in the last article, but what if there were?"
+  },
+  {
+    "title": "Communicate Between Components Using Dependency Injection",
+    "link": "https://blog.angularindepth.com/communicate-between-components-using-dependency-injection-d7280567faa7",
+    "text": "There is another problem we’ve found with our <toggle> component. We can’t have more than one <toggle-on> or <toggle-button> component in the same <toggle> and a <toggle-on> that is inside of another custom component won’t be picked up by the @ContentChild decorator."
+  },
+  {
+    "title": "Build a Toggle Component",
+    "link": "https://blog.angularindepth.com/build-a-toggle-component-6e8f44889c2c",
+    "text": "Just like in Kent C. Dodds’ Advanced React Component Patterns, we will use a relatively simple <toggle> component to illustrate these patterns. The <toggle> component is responsible for managing a singleboolean property: on."
+  },
+  {
+    "title": "Introducing Advanced Angular Component Patterns",
+    "link": "https://blog.angularindepth.com/introducing-advanced-angular-component-patterns-13e102e6bbfc",
+    "text": "This series of posts is my small attempt to broaden my own view by providing a translation of Kent C. Dodds’ Advanced React Patterns in Angular. My goal is to foster learning and sharing rather than criticism."
+  },
+  {
+    "title": "Top 10 Angular articles in 2017 from Angular-In-Depth you really want to read",
+    "link": "https://blog.angularindepth.com/top-10-angular-articles-in-2017-from-angularindepth-you-really-want-to-read-153ae6e497d4",
+    "text": "Almost one year ago I started Angular-In-Depth medium publication with the goal to become the largest and most technical Angular publication on medium. I was lucky to get on board very talented and knowledgeable guys Uri Shaked, Nicholas Jamieson and Chaz Gatian."
+  },
+  {
+    "title": "Practical RxJS In The Wild 🦁— Requests with concatMap() vs mergeMap() vs forkJoin() 🥊",
+    "link": "https://blog.angularindepth.com/practical-rxjs-in-the-wild-requests-with-concatmap-vs-mergemap-vs-forkjoin-11e5b2efe293",
+    "text": "I would like to share with you experience acquired by working on a yet another Hacker News client (code name HAKAFAKA 😂 still in alpha). I have been on the road for couple months now and realized that a small coding project wouldn’t hurt."
+  },
+  {
+    "title": "He who thinks change detection is depth-first and he who thinks it’s breadth-first are both usually right",
+    "link": "https://blog.angularindepth.com/he-who-thinks-change-detection-is-depth-first-and-he-who-thinks-its-breadth-first-are-both-usually-8b6bf24a63e6",
+    "text": "I was once asked if change detection in Angular is depth or breadth first. This basically means whether Angular first checks siblings of the current component (breadth-first) or its children (depth-first). I hadn’t given any prior thought to this question so I just went with my gut and the knowledge of internals."
+  },
+  {
+    "title": "Learn to combine RxJs sequences with super intuitive interactive diagrams",
+    "link": "https://blog.angularindepth.com/learn-to-combine-rxjs-sequences-with-super-intuitive-interactive-diagrams-20fce8e6511",
+    "text": "When working on a sufficiently complex application you usually have data coming from more than one data source. It can be some multiple external data points like Firebase or several UI widgets interacting with a user. Sequence composition is a technique that enables you to create complex queries."
+  },
+  {
+    "title": "React Call Return in Angular",
+    "link": "https://blog.angularindepth.com/react-call-return-in-angular-32a1c9751d6",
+    "text": "This article continues in the theme of taking React articles and reimagining them in Angular. See TemplateRefs are Angular’s Render Props and Content Directives Are Angular’s Prop Getters."
+  },
+  {
+    "title": "Do you really know what unidirectional data flow means in Angular",
+    "link": "https://blog.angularindepth.com/do-you-really-know-what-unidirectional-data-flow-means-in-angular-a6f55cefdc63",
+    "text": "Most architectural patterns are not easy to grasp especially when the information that describes them is scarce. One of such patterns in Angular is unidirectional data flow. There’s no clear explanation of what that means in the official documentation and it’s only briefly mentioned in the expression guidelines and template statements sections."
+  },
+  {
+    "title": "How to Reduce Action Boilerplate",
+    "link": "https://blog.angularindepth.com/how-to-reduce-action-boilerplate-90dc3d389e2b",
+    "text": "I use Redux for my application development and, to take advantage of RxJS, I use NgRx in Angular projects and redux-observable in React projects. I also use TypeScript."
+  },
+  {
+    "title": "These 5 articles will make you an Angular Change Detection expert",
+    "link": "https://blog.angularindepth.com/these-5-articles-will-make-you-an-angular-change-detection-expert-ed530d28930",
+    "text": "In the last 8 months I’ve spent most of my free time reverse-engineering Angular. The topic that fascinated me the most was change detection. I’d argue that it’s the most important part of the framework since it’s responsible for the “visible” job like DOM updates, input bindings and query list updates."
+  },
+  {
+    "title": "Angular CDK Portals",
+    "link": "https://blog.angularindepth.com/angular-cdk-portals-b02f66dd020c",
+    "text": "The @angular/cdk contains a concept called portals. In this post I’ll attempt to explain the concepts of a Portal, and when they should be applied. The example code in this post is referencing @angular/cdk@2.0.0-beta.12."
+  },
+  {
+    "title": "Content Directives Are Angular’s Prop Getters",
+    "link": "https://blog.angularindepth.com/content-directives-are-angulars-prop-getters-360fdae60576",
+    "text": "Kent C. Dodds wrote a piece about using prop getters in React. Along with render props (see TemplateRefs Are Angular’s Render Props), prop getters allow component library authors to give users as much control of the rendering as possible — the component only needs to do its job."
+  },
+  {
+    "title": "Using TransferState API in an Angular v5 Universal App",
+    "link": "https://blog.angularindepth.com/using-transferstate-api-in-an-angular-5-universal-app-130f3ada9e5b",
+    "text": "You can get a more up-to-date version at https://leanpub.com/angular-universal. Let’s illustrate this article with a concrete example. We have a weather app, displaying a list of cities in its sidebar. When you click on a city name, the app displays the current weather in this city."
+  },
+  {
+    "title": "Do you still think that NgZone (zone.js) is required for change detection in Angular?",
+    "link": "https://blog.angularindepth.com/do-you-still-think-that-ngzone-zone-js-is-required-for-change-detection-in-angular-16f7a575afef",
+    "text": "Most articles I have seen strongly associate Zone(zone.js) and NgZone with change detection in Angular. And although they are definitely related, technically they are not part of one whole. Yes, Zone and NgZone is used to automatically trigger change detection as a result of async operations."
+  },
+  {
+    "title": "As busy as a bee — lazy loading in the Angular CLI",
+    "link": "https://blog.angularindepth.com/as-busy-as-a-bee-lazy-loading-in-the-angular-cli-d2812141637f",
+    "text": "Angular has a programmatic API for lazy loading NgModule’s. In the Angular CLI, it has a direct dependency upon webpack’s underlying toolchain for chunk splitting and lazy loading. It’s thus (almost) impossible to use it outside of an ordinary router set-up. Custom lazy loading strategies need to use SystemJS."
+  },
+  {
+    "title": "TemplateRefs are Angular’s Render Props",
+    "link": "https://blog.angularindepth.com/templaterefs-are-angulars-render-props-a2b97cbcc362",
+    "text": "As a developer that spends most of my time building Angular apps, I still love reading about what the React community is doing. We’re generally solving the same problems and innovation in one community can be leveraged in another."
+  },
+  {
+    "title": "RxJS: How to Use Lettable Operators with Promises",
+    "link": "https://blog.angularindepth.com/rxjs-how-to-use-lettable-operators-and-promises-2e717313bf76",
+    "text": "Converting observables to promises is an antipattern. Unless you are integrating observables with a promise-based API, there is no reason to convert an observable into a promise."
+  },
+  {
+    "title": "RxJS: Pipelining Lettable Operators",
+    "link": "https://blog.angularindepth.com/rxjs-pipelining-lettable-operators-f92f6843d817",
+    "text": "Earlier this week, a TC39 proposal for a pipeline operator moved to stage-1. If the proposal is eventually accepted and included in the ECMAScript standard — it has a long way to go — it will offer a new syntax for lettable operators."
+  },
+  {
+    "title": "I reverse-engineered Zones (zone.js) and here is what I’ve found",
+    "link": "https://blog.angularindepth.com/i-reverse-engineered-zones-zone-js-and-here-is-what-ive-found-1f48dc87659b",
+    "text": "Zones is a new mechanism that helps developers work with multiple logically-connected async operations. Zones work by associating each async operation with a zone."
+  },
+  {
+    "title": "RxJS: Understanding Lettable Operators",
+    "link": "https://blog.angularindepth.com/rxjs-understanding-lettable-operators-fe74dda186d3",
+    "text": "Lettable operators offer a new way of composing observable chains and they have advantages for both application developers and library authors. Let’s look briefly at the existing composition mechanisms in RxJS and then look at lettable operators in more detail."
+  },
+  {
+    "title": "The essential difference between Constructor and ngOnInit in Angular",
+    "link": "https://blog.angularindepth.com/the-essential-difference-between-constructor-and-ngoninit-in-angular-c9930c209a42",
+    "text": "One of the most popular Angular questions on stackoverflow is Difference between Constructor and ngOnInit with over 100k views. I gave my answer to this question there but also decided to expand on it in this article."
+  },
+  {
+    "title": "RxJS: How to Use refCount",
+    "link": "https://blog.angularindepth.com/rxjs-how-to-use-refcount-73a0c6619a4e",
+    "text": "My previous article — Understanding the publish and share Operators — looked only briefly at the refCount method. Let’s look at it more closely here."
+  },
+  {
+    "title": "The essential difference between pure and impure pipes in Angular and why that matters",
+    "link": "https://blog.angularindepth.com/the-essential-difference-between-pure-and-impure-pipes-and-why-that-matters-999818aa068",
+    "text": "When writing a custom pipe in Angular you can specify whether you define a pure or an impure pipe. Angular has a pretty good documentation on pipes that you can find here. But as it often happens with documentation the clearly reasoning for division is missing."
+  },
+  {
+    "title": "RxJS: Understanding the publish and share Operators",
+    "link": "https://blog.angularindepth.com/rxjs-understanding-the-publish-and-share-operators-16ea2f446635",
+    "text": "I’m often asked questions that relate to the publish operator: What’s the difference between publish and share? How do I import the refCount operator? When should I use an AsyncSubject? Let’s answer these questions — and more — by starting with the basics."
+  },
+  {
+    "title": "If you think `ngDoCheck` means your component is being checked — read this article",
+    "link": "https://blog.angularindepth.com/if-you-think-ngdocheck-means-your-component-is-being-checked-read-this-article-36ce63a3f3e5",
+    "text": "There’s one question that comes up again and again on stackoverflow. The question is about ngDoCheck lifecycle hook that is triggered for a component that implements OnPush change detection strategy."
+  }
+]

From 0eafc2538781da9d2facdf4f9e5d53d171e2e4cb Mon Sep 17 00:00:00 2001
From: denStrigo <d.strigo@akveo.com>
Date: Tue, 13 Nov 2018 20:02:22 +0300
Subject: [PATCH 05/11] feat(components): add new nebular chert component,
 update styles

---
 src/app/@theme/theme.module.ts                |   5 +
 .../accordion/accordion.component.html        |  11 +-
 .../accordion/accordion.component.scss        |   9 +-
 .../nebular/calundar/calendar.component.html  |   8 +-
 .../nebular/calundar/calendar.component.scss  |  10 +-
 src/app/pages/nebular/chat/bot-replies.ts     | 190 ++++++++++++++++
 .../pages/nebular/chat/chat.component.html    |  20 ++
 .../pages/nebular/chat/chat.component.scss    |  22 ++
 src/app/pages/nebular/chat/chat.component.ts  |  44 ++++
 src/app/pages/nebular/chat/chat.service.ts    |  42 ++++
 src/app/pages/nebular/chat/messages.ts        |  85 ++++++++
 .../datepicker/datepicker.component.html      |   9 +-
 .../datepicker/datepicker.component.scss      |   9 -
 .../datepicker/datepicker.component.ts        |   3 -
 .../pages/nebular/nebular-routing.module.ts   |   5 +
 src/app/pages/nebular/nebular.module.ts       |   2 +
 .../nebular/stepper/stepper.component.html    | 204 +++++++++---------
 .../nebular/stepper/stepper.component.scss    |  16 --
 src/app/pages/pages-menu.ts                   |   4 +
 19 files changed, 555 insertions(+), 143 deletions(-)
 create mode 100644 src/app/pages/nebular/chat/bot-replies.ts
 create mode 100644 src/app/pages/nebular/chat/chat.component.html
 create mode 100644 src/app/pages/nebular/chat/chat.component.scss
 create mode 100644 src/app/pages/nebular/chat/chat.component.ts
 create mode 100644 src/app/pages/nebular/chat/chat.service.ts
 create mode 100644 src/app/pages/nebular/chat/messages.ts

diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts
index bc0b9fc4c5..495a1f452e 100644
--- a/src/app/@theme/theme.module.ts
+++ b/src/app/@theme/theme.module.ts
@@ -33,6 +33,7 @@ import {
   NbSpinnerModule,
   NbRadioModule,
   NbSelectModule,
+  NbChatModule,
 } from '@nebular/theme';
 
 import { NbSecurityModule } from '@nebular/security';
@@ -98,6 +99,7 @@ const NB_MODULES = [
   NbSpinnerModule,
   NbRadioModule,
   NbSelectModule,
+  NbChatModule,
 ];
 
 const COMPONENTS = [
@@ -141,6 +143,9 @@ const NB_THEME_PROVIDERS = [
   ...NbDialogModule.forRoot().providers,
   ...NbWindowModule.forRoot().providers,
   ...NbToastrModule.forRoot().providers,
+  ...NbChatModule.forRoot({
+    messageGoogleMapKey: 'AIzaSyA_wNuCzia92MAmdLRzmqitRGvCF7wCZPY',
+  }).providers,
 ];
 
 @NgModule({
diff --git a/src/app/pages/nebular/accordion/accordion.component.html b/src/app/pages/nebular/accordion/accordion.component.html
index b87f0bdf17..e6cea2d9d0 100644
--- a/src/app/pages/nebular/accordion/accordion.component.html
+++ b/src/app/pages/nebular/accordion/accordion.component.html
@@ -1,6 +1,7 @@
-<div class="accordions-container">
-  <div class="accordion-container">
+<div class="accordions-container row">
+  <div class="accordion-container col-md-12 col-lg-6 col-xxxl-6">
     <nb-card>
+      <nb-card-header>Toggle Accordion by button</nb-card-header>
       <nb-card-body>
         <button nbButton (click)="toggle()">Toggle First Item</button>
       </nb-card-body>
@@ -42,7 +43,11 @@
     </nb-accordion>
   </div>
 
-  <div class="accordion-container">
+  <div class="accordion-container col-md-12 col-lg-6 col-xxxl-6">
+    <nb-card>
+      <nb-card-header>Accordion</nb-card-header>
+    </nb-card>
+
     <nb-accordion multi>
       <nb-accordion-item>
         <nb-accordion-item-header>
diff --git a/src/app/pages/nebular/accordion/accordion.component.scss b/src/app/pages/nebular/accordion/accordion.component.scss
index 05a71878a9..c8d3673954 100644
--- a/src/app/pages/nebular/accordion/accordion.component.scss
+++ b/src/app/pages/nebular/accordion/accordion.component.scss
@@ -1,9 +1,12 @@
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/breakpoints';
+
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  .accordion-container {
-    &:not(:first-child) {
-      margin-top: 3rem;
+  @include media-breakpoint-down(md) {
+    .accordion-container {
+      margin-bottom: 3rem;
     }
   }
 }
diff --git a/src/app/pages/nebular/calundar/calendar.component.html b/src/app/pages/nebular/calundar/calendar.component.html
index 1ef119fef4..2300bfef68 100644
--- a/src/app/pages/nebular/calundar/calendar.component.html
+++ b/src/app/pages/nebular/calundar/calendar.component.html
@@ -1,3 +1,7 @@
+<nb-card>
+  <nb-card-header>Calendar</nb-card-header>
+</nb-card>
+
 <div class="calendars-container">
   <div class="nebular-calendar">
     <h2>
@@ -12,7 +16,9 @@ <h2>
     <nb-calendar-range [(range)]="range"></nb-calendar-range>
   </div>
   <div class="nebular-calendar">
-    <h1>Selected date: {{ date2 | date }}</h1>
+    <h2>
+      Selected date: {{ date2 | date }}
+    </h2>
     <nb-calendar
       [(date)]="date2"
       [dayCellComponent]="dayCellComponent"
diff --git a/src/app/pages/nebular/calundar/calendar.component.scss b/src/app/pages/nebular/calundar/calendar.component.scss
index b75a7fb51e..7a3e05ee82 100644
--- a/src/app/pages/nebular/calundar/calendar.component.scss
+++ b/src/app/pages/nebular/calundar/calendar.component.scss
@@ -1,14 +1,16 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-
   .calendars-container {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+    margin-top: 2rem;
+  }
+
+  h2 {
+    text-align: center;
   }
 
   .nebular-calendar {
+    margin-bottom: 3rem;
     flex: 1;
     display: flex;
     flex-direction: column;
diff --git a/src/app/pages/nebular/chat/bot-replies.ts b/src/app/pages/nebular/chat/bot-replies.ts
new file mode 100644
index 0000000000..23d8cd1765
--- /dev/null
+++ b/src/app/pages/nebular/chat/bot-replies.ts
@@ -0,0 +1,190 @@
+const botAvatar: string = 'https://i.ytimg.com/vi/Erqi5ckVoEo/hqdefault.jpg';
+
+export const gifsLinks: string[] = [
+  'https://media.tenor.com/images/ac287fd06319e47b1533737662d5bfe8/tenor.gif',
+  'https://i.gifer.com/no.gif',
+  'https://techcrunch.com/wp-content/uploads/2015/08/safe_image.gif',
+  'http://www.reactiongifs.com/r/wnd1.gif',
+];
+export const imageLinks: string[] = [
+  'https://picsum.photos/320/240/?image=357',
+  'https://picsum.photos/320/240/?image=556',
+  'https://picsum.photos/320/240/?image=339',
+  'https://picsum.photos/320/240/?image=387',
+  'https://picsum.photos/320/240/?image=30',
+  'https://picsum.photos/320/240/?image=271',
+];
+const fileLink: string = 'http://google.com';
+
+export const botReplies = [
+  {
+    regExp: /([H,h]ey)|([H,h]i)/g,
+    answerArray: ['Hello!', 'Yes?', 'Yes, milord?', 'What can I do for you?'],
+    type: 'text',
+    reply: {
+      text: '',
+      reply: false,
+      date: new Date(),
+      user: {
+        name: 'Bot',
+        avatar: botAvatar,
+      },
+    },
+  },
+  {
+    regExp: /([H,h]elp)/g,
+    answerArray: [`No problem! Try sending a message containing word "hey", "image",
+    "gif", "file", "map", "quote", "file group" to see different message components`],
+    type: 'text',
+    reply: {
+      text: '',
+      reply: false,
+      date: new Date(),
+      user: {
+        name: 'Bot',
+        avatar: botAvatar,
+      },
+    },
+  },
+  {
+    regExp: /([I,i]mage)|(IMAGE)|([P,p]ic)|(Picture)/g,
+    answerArray: ['Hey look at this!', 'Ready to work', 'Yes, master.'],
+    type: 'pic',
+    reply: {
+      text: '',
+      reply: false,
+      date: new Date(),
+      type: 'file',
+      files: [
+        {
+          url: '',
+          type: 'image/jpeg',
+        },
+      ],
+      user: {
+        name: 'Bot',
+        avatar: botAvatar,
+      },
+    },
+  },
+  {
+    regExp: /([G,g]if)|(GIF)/g,
+    type: 'gif',
+    answerArray: ['No problem', 'Well done', 'You got it man'],
+    reply: {
+      text: '',
+      reply: false,
+      date: new Date(),
+      type: 'file',
+      files: [
+        {
+          url: '',
+          type: 'image/gif',
+        },
+      ],
+      user: {
+        name: 'Bot',
+        avatar: botAvatar,
+      },
+    },
+  },
+  {
+    regExp: /([F,f]ile group)|(FILE)/g,
+    type: 'group',
+    answerArray: ['Take it!', 'Job Done.', 'As you wish'],
+    reply: {
+      text: '',
+      reply: false,
+      date: new Date(),
+      type: 'file',
+      files: [
+        {
+          url: fileLink,
+          icon: 'nb-compose',
+        },
+        {
+          url: '',
+          type: 'image/gif',
+        },
+        {
+          url: '',
+          type: 'image/jpeg',
+        },
+      ],
+      icon: 'nb-compose',
+      user: {
+        name: 'Bot',
+        avatar: botAvatar,
+      },
+    },
+  },
+  {
+    regExp: /([F,f]ile)|(FILE)/g,
+    type: 'file',
+    answerArray: ['Take it!', 'Job Done.', 'As you wish'],
+    reply: {
+      text: '',
+      reply: false,
+      date: new Date(),
+      type: 'file',
+      files: [
+        {
+          url: fileLink,
+          icon: 'nb-compose',
+        },
+      ],
+      icon: 'nb-compose',
+      user: {
+        name: 'Bot',
+        avatar: botAvatar,
+      },
+    },
+  },
+  {
+    regExp: /([M,m]ap)|(MAP)/g,
+    type: 'map',
+    answerArray: ['Done.', 'My sight is yours.', 'I shall be your eyes.'],
+    reply: {
+      text: '',
+      reply: false,
+      date: new Date(),
+      type: 'map',
+      latitude: 53.914321,
+      longitude: 27.5998355,
+      user: {
+        name: 'Bot',
+        avatar: botAvatar,
+      },
+    },
+  },
+  {
+    regExp: /([Q,q]uote)|(QUOTE)/g,
+    type: 'quote',
+    answerArray: ['Quoted!', 'Say no more.', 'I gladly obey.'],
+    reply: {
+      text: '',
+      reply: false,
+      date: new Date(),
+      type: 'quote',
+      quote: '',
+      user: {
+        name: 'Bot',
+        avatar: botAvatar,
+      },
+    },
+  },
+  {
+    regExp: /(.*)/g,
+    answerArray: ['Hello there! Try typing "help"'],
+    type: 'text',
+    reply: {
+      text: '',
+      reply: false,
+      date: new Date(),
+      user: {
+        name: 'Bot',
+        avatar: botAvatar,
+      },
+    },
+  },
+];
diff --git a/src/app/pages/nebular/chat/chat.component.html b/src/app/pages/nebular/chat/chat.component.html
new file mode 100644
index 0000000000..7bbddfbfcc
--- /dev/null
+++ b/src/app/pages/nebular/chat/chat.component.html
@@ -0,0 +1,20 @@
+<nb-card>
+  <nb-card-header>Chat</nb-card-header>
+</nb-card>
+
+<nb-chat title="Nebular Conversational UI" size="large" status="success">
+  <nb-chat-message *ngFor="let msg of messages"
+                   [type]="msg.type"
+                   [message]="msg.text"
+                   [reply]="msg.reply"
+                   [sender]="msg.user.name"
+                   [date]="msg.date"
+                   [files]="msg.files"
+                   [quote]="msg.quote"
+                   [latitude]="msg.latitude"
+                   [longitude]="msg.longitude"
+                   [avatar]="msg.user.avatar">
+  </nb-chat-message>
+  <nb-chat-form (send)="sendMessage($event)" [dropFiles]="true">
+  </nb-chat-form>
+</nb-chat>
diff --git a/src/app/pages/nebular/chat/chat.component.scss b/src/app/pages/nebular/chat/chat.component.scss
new file mode 100644
index 0000000000..497f908a1d
--- /dev/null
+++ b/src/app/pages/nebular/chat/chat.component.scss
@@ -0,0 +1,22 @@
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/breakpoints';
+
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  /deep/ nb-layout-column {
+    justify-content: center;
+    display: flex;
+  }
+
+  nb-chat {
+    margin: 0 auto;
+    width: 500px;
+  }
+
+  @include media-breakpoint-down(is) {
+    nb-chat {
+      width: 300px;
+    }
+  }
+}
diff --git a/src/app/pages/nebular/chat/chat.component.ts b/src/app/pages/nebular/chat/chat.component.ts
new file mode 100644
index 0000000000..fef91c6d86
--- /dev/null
+++ b/src/app/pages/nebular/chat/chat.component.ts
@@ -0,0 +1,44 @@
+import { Component } from '@angular/core';
+
+import { ChatService } from './chat.service';
+
+@Component({
+  selector: 'ngx-chat',
+  templateUrl: 'chat.component.html',
+  styleUrls: ['chat.component.scss'],
+  providers: [ ChatService ],
+})
+export class ChatComponent {
+
+  messages: any[];
+
+  constructor(protected chatService: ChatService) {
+    this.messages = this.chatService.loadMessages();
+  }
+
+  sendMessage(event: any) {
+    const files = !event.files ? [] : event.files.map((file) => {
+      return {
+        url: file.src,
+        type: file.type,
+        icon: 'nb-compose',
+      };
+    });
+
+    this.messages.push({
+      text: event.message,
+      date: new Date(),
+      reply: true,
+      type: files.length ? 'file' : 'text',
+      files: files,
+      user: {
+        name: 'Jonh Doe',
+        avatar: 'https://i.gifer.com/no.gif',
+      },
+    });
+    const botReply = this.chatService.reply(event.message);
+    if (botReply) {
+      setTimeout(() => { this.messages.push(botReply); }, 500);
+    }
+  }
+}
diff --git a/src/app/pages/nebular/chat/chat.service.ts b/src/app/pages/nebular/chat/chat.service.ts
new file mode 100644
index 0000000000..493b4f4a6c
--- /dev/null
+++ b/src/app/pages/nebular/chat/chat.service.ts
@@ -0,0 +1,42 @@
+import { Injectable } from '@angular/core';
+
+import { messages } from './messages';
+import { botReplies, gifsLinks, imageLinks } from './bot-replies';
+
+@Injectable()
+export class ChatService {
+
+
+  loadMessages() {
+    return messages;
+  }
+
+  loadBotReplies() {
+    return botReplies;
+  }
+
+  reply(message: string) {
+    const botReply: any =  this.loadBotReplies()
+      .find((reply: any) => message.search(reply.regExp) !== -1);
+
+    if (botReply.reply.type === 'quote') {
+      botReply.reply.quote = message;
+    }
+
+    if (botReply.type === 'gif') {
+      botReply.reply.files[0].url = gifsLinks[Math.floor(Math.random() * gifsLinks.length)];
+    }
+
+    if (botReply.type === 'pic') {
+      botReply.reply.files[0].url = imageLinks[Math.floor(Math.random() * imageLinks.length)];
+    }
+
+    if (botReply.type === 'group') {
+      botReply.reply.files[1].url = gifsLinks[Math.floor(Math.random() * gifsLinks.length)];
+      botReply.reply.files[2].url = imageLinks[Math.floor(Math.random() * imageLinks.length)];
+    }
+
+    botReply.reply.text = botReply.answerArray[Math.floor(Math.random() * botReply.answerArray.length)];
+    return { ...botReply.reply };
+  }
+}
diff --git a/src/app/pages/nebular/chat/messages.ts b/src/app/pages/nebular/chat/messages.ts
new file mode 100644
index 0000000000..14f9cd0888
--- /dev/null
+++ b/src/app/pages/nebular/chat/messages.ts
@@ -0,0 +1,85 @@
+export const messages = [
+  {
+    text: 'Hello, how are you? This should be a very long message so that we can test how it fit into the screen.',
+    reply: false,
+    date: new Date(),
+    user: {
+      name: 'John Doe',
+      avatar: 'https://i.gifer.com/no.gif',
+    },
+  },
+  {
+    text: 'Hello, how are you? This should be a very long message so that we can test how it fit into the screen.',
+    reply: true,
+    date: new Date(),
+    user: {
+      name: 'John Doe',
+      avatar: 'https://i.gifer.com/no.gif',
+    },
+  },
+  {
+    text: 'Hello, how are you?',
+    reply: false,
+    date: new Date(),
+    user: {
+      name: 'John Doe',
+      avatar: '',
+    },
+  },
+  {
+    text: 'Hey looks at that pic I just found!',
+    reply: false,
+    date: new Date(),
+    type: 'file',
+    files: [
+      {
+        url: 'https://i.gifer.com/no.gif',
+        type: 'image/jpeg',
+        icon: false,
+      },
+    ],
+    user: {
+      name: 'John Doe',
+      avatar: '',
+    },
+  },
+  {
+    text: 'What do you mean by that?',
+    reply: false,
+    date: new Date(),
+    type: 'quote',
+    quote: 'Hello, how are you? This should be a very long message so that we can test how it fit into the screen.',
+    user: {
+      name: 'John Doe',
+      avatar: '',
+    },
+  },
+  {
+    text: 'Attached is an archive I mentioned',
+    reply: true,
+    date: new Date(),
+    type: 'file',
+    files: [
+      {
+        url: 'https://i.gifer.com/no.gif',
+        icon: 'nb-compose',
+      },
+    ],
+    user: {
+      name: 'John Doe',
+      avatar: '',
+    },
+  },
+  {
+    text: 'Meet me there',
+    reply: false,
+    date: new Date(),
+    type: 'map',
+    latitude: 40.714728,
+    longitude: -73.998672,
+    user: {
+      name: 'John Doe',
+      avatar: '',
+    },
+  },
+];
diff --git a/src/app/pages/nebular/datepicker/datepicker.component.html b/src/app/pages/nebular/datepicker/datepicker.component.html
index e4a51c3a06..9b40152dcd 100644
--- a/src/app/pages/nebular/datepicker/datepicker.component.html
+++ b/src/app/pages/nebular/datepicker/datepicker.component.html
@@ -10,14 +10,11 @@
       <nb-datepicker #formpicker></nb-datepicker>
     </div>
     <div>
-      <input nbInput placeholder="Form Picker" [nbDatepicker]="formcontrol" [formControl]="formControl">
-      <nb-datepicker #formcontrol></nb-datepicker>
-
-      <input nbInput placeholder="Form Picker" [nbDatepicker]="ngmodel" [(ngModel)]="ngModelDate">
-      <nb-datepicker #ngmodel></nb-datepicker>
+      <input nbInput placeholder="Range Picker" [nbDatepicker]="rangepicker">
+      <nb-rangepicker #rangepicker></nb-rangepicker>
     </div>
     <div>
-      <input nbInput placeholder="Form Picker" [nbDatepicker]="picker">
+      <input nbInput placeholder="Min Max Picker" [nbDatepicker]="picker">
       <nb-datepicker #picker [min]="min" [max]="max"></nb-datepicker>
     </div>
   </nb-card-body>
diff --git a/src/app/pages/nebular/datepicker/datepicker.component.scss b/src/app/pages/nebular/datepicker/datepicker.component.scss
index 4ca27cae36..df3983ede6 100644
--- a/src/app/pages/nebular/datepicker/datepicker.component.scss
+++ b/src/app/pages/nebular/datepicker/datepicker.component.scss
@@ -1,17 +1,8 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-
   nb-card-body {
     display: flex;
     justify-content: space-between;
-
-/*    & > div {
-      margin-left: 5rem;
-
-      &:first-child {
-        margin-left: 0;
-      }
-    }*/
   }
 }
diff --git a/src/app/pages/nebular/datepicker/datepicker.component.ts b/src/app/pages/nebular/datepicker/datepicker.component.ts
index b436370ef1..79ddec0b8e 100644
--- a/src/app/pages/nebular/datepicker/datepicker.component.ts
+++ b/src/app/pages/nebular/datepicker/datepicker.component.ts
@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-import { FormControl } from '@angular/forms';
 import { NbDateService } from '@nebular/theme';
 
 @Component({
@@ -11,8 +10,6 @@ export class DatepickerComponent {
 
   min: Date;
   max: Date;
-  formControl = new FormControl(new Date());
-  ngModelDate = new Date();
 
   constructor(protected dateService: NbDateService<Date>) {
     this.min = this.dateService.addDay(this.dateService.today(), -5);
diff --git a/src/app/pages/nebular/nebular-routing.module.ts b/src/app/pages/nebular/nebular-routing.module.ts
index 8302efbd72..6b46a61d8b 100644
--- a/src/app/pages/nebular/nebular-routing.module.ts
+++ b/src/app/pages/nebular/nebular-routing.module.ts
@@ -15,6 +15,7 @@ import { AlertComponent } from './alert/alert.component';
 import { ProgressBarComponent } from './progress-bar/progress-bar.component';
 import { SpinnerComponent } from './spinner/spinner.component';
 import { NebularFormInputsComponent } from './form-inputs/nebular-form-inputs.component';
+import { ChatComponent } from './chat/chat.component';
 
 const routes: Routes = [{
   path: '',
@@ -72,6 +73,10 @@ const routes: Routes = [{
       path: 'form-inputs',
       component: NebularFormInputsComponent,
     },
+    {
+      path: 'chat',
+      component: ChatComponent,
+    },
   ],
 }];
 
diff --git a/src/app/pages/nebular/nebular.module.ts b/src/app/pages/nebular/nebular.module.ts
index 6059d4d63e..cbf5a4328d 100644
--- a/src/app/pages/nebular/nebular.module.ts
+++ b/src/app/pages/nebular/nebular.module.ts
@@ -35,6 +35,7 @@ import { NebularInputsComponent } from './form-inputs/nebular-inputs/nebular-inp
 import { NebularCheckboxComponent } from './form-inputs/nebular-checkbox/nebular-checkbox.component';
 import { NebularRadioGroupComponent } from './form-inputs/nebular-radio-group/nebular-radio-group.component';
 import { NebularSelectComponent } from './form-inputs/nebular-select/nebular-select.component';
+import { ChatComponent } from './chat/chat.component';
 
 // services
 import { NewsService } from './services/news.service';
@@ -71,6 +72,7 @@ const COMPONENTS = [
   NebularCheckboxComponent,
   NebularRadioGroupComponent,
   NebularSelectComponent,
+  ChatComponent,
 ];
 
 const ENTRY_COMPONENTS = [
diff --git a/src/app/pages/nebular/stepper/stepper.component.html b/src/app/pages/nebular/stepper/stepper.component.html
index cad4c04ea8..ec220c4bac 100644
--- a/src/app/pages/nebular/stepper/stepper.component.html
+++ b/src/app/pages/nebular/stepper/stepper.component.html
@@ -1,4 +1,8 @@
 <nb-card>
+  <nb-card-header>Stepper</nb-card-header>
+</nb-card>
+
+<nb-card class="col-md-12 col-lg-12 col-xxxl-12">
   <nb-card-body>
     <nb-stepper orientation="horizontal">
       <nb-step [label]="labelOne">
@@ -28,112 +32,116 @@ <h3>Step content #4</h3>
   </nb-card-body>
 </nb-card>
 
-<div class="steppers-container">
-  <nb-card>
-    <nb-card-body>
-      <nb-stepper #stepper>
-        <nb-step [stepControl]="firstForm" label="First step">
-          <form [formGroup]="firstForm" (ngSubmit)="onFirstSubmit()" class="step-container">
+<div class="steppers-container row">
+  <div class="col-md-12 col-lg-6 col-xxxl-6">
+    <nb-card>
+      <nb-card-body>
+        <nb-stepper #stepper>
+          <nb-step [stepControl]="firstForm" label="First step">
+            <form [formGroup]="firstForm" (ngSubmit)="onFirstSubmit()" class="step-container">
+              <p class="lorem">
+                Lorizzle ipsum dolizzle stuff fizzle, consectetuer adipiscing break it down. Nullizzle sapien velizzle,
+                my shizz pimpin', shizzle my nizzle crocodizzle shut the shizzle up, gravida vizzle, dang.
+              </p>
+              <div class="input-group">
+                <input type="text" placeholder="Enter your name" class="form-control" formControlName="firstCtrl"
+                       [ngClass]="{'form-control-danger': firstForm.invalid && (firstForm.dirty || firstForm.touched)}">
+              </div>
+              <button nbButton nbStepperNext>next</button>
+            </form>
+          </nb-step>
+          <nb-step [stepControl]="secondForm" label="Second step">
+            <form [formGroup]="secondForm" (ngSubmit)="onSecondSubmit()" class="step-container">
+              <p class="lorem">
+                Pellentesque we gonna chung tortor.
+                Sizzle pizzle. Fizzle izzle dolor dapibus fo shizzle mah nizzle fo rizzle, mah home g-dizzle tempus tempor.
+                Maurizzle cool nibh owned turpizzle. My shizz fo shizzle tortor.
+              </p>
+              <div class="input-group">
+                <input type="text" placeholder="Enter favorite movie" class="form-control" formControlName="secondCtrl"
+                       [ngClass]="{'form-control-danger': secondForm.invalid && (secondForm.dirty || secondForm.touched)}">
+              </div>
+              <button nbButton nbStepperPrevious>prev</button>
+              <button nbButton nbStepperNext>next</button>
+            </form>
+          </nb-step>
+          <nb-step [stepControl]="thirdForm" label="Third step">
+            <form [formGroup]="thirdForm" (ngSubmit)="onThirdSubmit()" class="step-container">
+              <p class="lorem">
+                Things boom shackalack rhoncus yo. In fo shizzle my nizzle gangsta platea dictumst. Check it out pot.
+              </p>
+              <div class="input-group">
+                <input type="text" placeholder="Enter something" class="form-control" formControlName="thirdCtrl"
+                       [ngClass]="{'form-control-danger': thirdForm.invalid && (thirdForm.dirty || thirdForm.touched)}">
+              </div>
+              <button nbButton nbStepperPrevious>prev</button>
+              <button nbButton nbStepperNext>Confirm</button>
+            </form>
+          </nb-step>
+          <nb-step [stepControl]="thirdForm" [hidden]="true" label="Third step">
+            <div class="step-container">
+              <h3>Wizard completed!</h3>
+              <button nbButton (click)="stepper.reset()">Try again</button>
+            </div>
+          </nb-step>
+        </nb-stepper>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-6">
+    <nb-card size="medium">
+      <nb-card-body>
+        <nb-stepper orientation="vertical">
+          <nb-step label="First step">
+            <h3>Step content #1</h3>
             <p class="lorem">
-              Lorizzle ipsum dolizzle stuff fizzle, consectetuer adipiscing break it down. Nullizzle sapien velizzle,
-              my shizz pimpin', shizzle my nizzle crocodizzle shut the shizzle up, gravida vizzle, dang.
+              Proin varius accumsan semper. Praesent consequat tincidunt sagittis. Curabitur egestas sem a ipsum bibendum,
+              sit amet fringilla orci efficitur. Nam bibendum lectus ut viverra tristique. Fusce eu pulvinar magna, quis
+              viverra ex. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent metus turpis, commodo vel
+              placerat quis, lobortis in ligula.
             </p>
-            <div class="input-group">
-              <input type="text" placeholder="Enter your name" class="form-control" formControlName="firstCtrl"
-                     [ngClass]="{'form-control-danger': firstForm.invalid && (firstForm.dirty || firstForm.touched)}">
-            </div>
+            <button nbButton disabled nbStepperNext>prev</button>
             <button nbButton nbStepperNext>next</button>
-          </form>
-        </nb-step>
-        <nb-step [stepControl]="secondForm" label="Second step">
-          <form [formGroup]="secondForm" (ngSubmit)="onSecondSubmit()" class="step-container">
+          </nb-step>
+          <nb-step label="Second step">
+            <h3>Step content #2</h3>
             <p class="lorem">
-              Pellentesque we gonna chung tortor.
-              Sizzle pizzle. Fizzle izzle dolor dapibus fo shizzle mah nizzle fo rizzle, mah home g-dizzle tempus tempor.
-              Maurizzle cool nibh owned turpizzle. My shizz fo shizzle tortor.
+              Curabitur luctus mattis risus nec condimentum. Donec at dui turpis. Sed vehicula fringilla rutrum. Nullam
+              sed ornare magna. Mauris vitae laoreet diam. Mauris fermentum ligula at lacinia semper. Nulla placerat dui
+              eu sapien pellentesque, eu placerat leo luctus. Cras pharetra blandit fermentum.
             </p>
-            <div class="input-group">
-              <input type="text" placeholder="Enter favorite movie" class="form-control" formControlName="secondCtrl"
-                     [ngClass]="{'form-control-danger': secondForm.invalid && (secondForm.dirty || secondForm.touched)}">
-            </div>
             <button nbButton nbStepperPrevious>prev</button>
             <button nbButton nbStepperNext>next</button>
-          </form>
-        </nb-step>
-        <nb-step [stepControl]="thirdForm" label="Third step">
-          <form [formGroup]="thirdForm" (ngSubmit)="onThirdSubmit()" class="step-container">
+          </nb-step>
+          <nb-step label="Third step">
+            <h3>Step content #3</h3>
             <p class="lorem">
-              Things boom shackalack rhoncus yo. In fo shizzle my nizzle gangsta platea dictumst. Check it out pot.
+              Proin varius accumsan semper. Praesent consequat tincidunt sagittis. Curabitur egestas sem a ipsum bibendum,
+              sit amet fringilla orci efficitur. Nam bibendum lectus ut viverra tristique. Fusce eu pulvinar magna, quis
+              viverra ex. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent metus turpis, commodo vel
+              placerat quis, lobortis in ligula.
+            </p>
+            <p class="lorem">
+              Curabitur luctus mattis risus nec condimentum. Donec at dui turpis. Sed vehicula fringilla rutrum. Nullam
+              sed ornare magna. Mauris vitae laoreet diam. Mauris fermentum ligula at lacinia semper. Nulla placerat dui
+              eu sapien pellentesque, eu placerat leo luctus. Cras pharetra blandit fermentum.
             </p>
-            <div class="input-group">
-              <input type="text" placeholder="Enter something" class="form-control" formControlName="thirdCtrl"
-                     [ngClass]="{'form-control-danger': thirdForm.invalid && (thirdForm.dirty || thirdForm.touched)}">
-            </div>
             <button nbButton nbStepperPrevious>prev</button>
-            <button nbButton nbStepperNext>Confirm</button>
-          </form>
-        </nb-step>
-        <nb-step [stepControl]="thirdForm" [hidden]="true" label="Third step">
-          <div class="step-container">
-            <h3>Wizard completed!</h3>
-            <button nbButton (click)="stepper.reset()">Try again</button>
-          </div>
-        </nb-step>
-      </nb-stepper>
-    </nb-card-body>
-  </nb-card>
-
-  <nb-card size="medium">
-    <nb-card-body>
-      <nb-stepper orientation="vertical">
-        <nb-step label="First step">
-          <h3>Step content #1</h3>
-          <p class="lorem">
-            Proin varius accumsan semper. Praesent consequat tincidunt sagittis. Curabitur egestas sem a ipsum bibendum,
-            sit amet fringilla orci efficitur. Nam bibendum lectus ut viverra tristique. Fusce eu pulvinar magna, quis
-            viverra ex. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent metus turpis, commodo vel
-            placerat quis, lobortis in ligula.
-          </p>
-          <button nbButton disabled nbStepperNext>prev</button>
-          <button nbButton nbStepperNext>next</button>
-        </nb-step>
-        <nb-step label="Second step">
-          <h3>Step content #2</h3>
-          <p class="lorem">
-            Curabitur luctus mattis risus nec condimentum. Donec at dui turpis. Sed vehicula fringilla rutrum. Nullam
-            sed ornare magna. Mauris vitae laoreet diam. Mauris fermentum ligula at lacinia semper. Nulla placerat dui
-            eu sapien pellentesque, eu placerat leo luctus. Cras pharetra blandit fermentum.
-          </p>
-          <button nbButton nbStepperPrevious>prev</button>
-          <button nbButton nbStepperNext>next</button>
-        </nb-step>
-        <nb-step label="Third step">
-          <h3>Step content #3</h3>
-          <p class="lorem">
-            Proin varius accumsan semper. Praesent consequat tincidunt sagittis. Curabitur egestas sem a ipsum bibendum,
-            sit amet fringilla orci efficitur. Nam bibendum lectus ut viverra tristique. Fusce eu pulvinar magna, quis
-            viverra ex. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent metus turpis, commodo vel
-            placerat quis, lobortis in ligula.
-          </p>
-          <p class="lorem">
-            Curabitur luctus mattis risus nec condimentum. Donec at dui turpis. Sed vehicula fringilla rutrum. Nullam
-            sed ornare magna. Mauris vitae laoreet diam. Mauris fermentum ligula at lacinia semper. Nulla placerat dui
-            eu sapien pellentesque, eu placerat leo luctus. Cras pharetra blandit fermentum.
-          </p>
-          <button nbButton nbStepperPrevious>prev</button>
-          <button nbButton nbStepperNext>next</button>
-        </nb-step>
-        <nb-step label="Fourth step">
-          <h3>Step content #4</h3>
-          <p class="lorem">
-            Proin varius accumsan semper. Praesent consequat tincidunt sagittis. Curabitur egestas sem a ipsum bibendum,
-            sit amet fringilla orci efficitur. Nam bibendum lectus ut viverra tristique. Fusce eu pulvinar magna, quis
-            viverra ex.
-          </p>
-          <button nbButton nbStepperPrevious>prev</button>
-          <button nbButton disabled nbStepperNext>next</button>
-        </nb-step>
-      </nb-stepper>
-    </nb-card-body>
-  </nb-card>
+            <button nbButton nbStepperNext>next</button>
+          </nb-step>
+          <nb-step label="Fourth step">
+            <h3>Step content #4</h3>
+            <p class="lorem">
+              Proin varius accumsan semper. Praesent consequat tincidunt sagittis. Curabitur egestas sem a ipsum bibendum,
+              sit amet fringilla orci efficitur. Nam bibendum lectus ut viverra tristique. Fusce eu pulvinar magna, quis
+              viverra ex.
+            </p>
+            <button nbButton nbStepperPrevious>prev</button>
+            <button nbButton disabled nbStepperNext>next</button>
+          </nb-step>
+        </nb-stepper>
+      </nb-card-body>
+    </nb-card>
+  </div>
 </div>
diff --git a/src/app/pages/nebular/stepper/stepper.component.scss b/src/app/pages/nebular/stepper/stepper.component.scss
index 13db43c0e7..e596439d5b 100644
--- a/src/app/pages/nebular/stepper/stepper.component.scss
+++ b/src/app/pages/nebular/stepper/stepper.component.scss
@@ -9,20 +9,4 @@
       margin: 0.5rem;
     }
   }
-
-  .steppers-container {
-    display: flex;
-
-    .input-group {
-      margin-bottom: 0.5rem;
-    }
-
-    nb-card {
-      flex: 1;
-
-      &:not(:first-child) {
-        margin-left: 1rem;
-      }
-    }
-  }
 }
diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts
index 592cbfb597..cf41abcf50 100644
--- a/src/app/pages/pages-menu.ts
+++ b/src/app/pages/pages-menu.ts
@@ -72,6 +72,10 @@ export const MENU_ITEMS: NbMenuItem[] = [
         title: 'Form Inputs',
         link: '/pages/nebular/form-inputs',
       },
+      {
+        title: 'Chat',
+        link: '/pages/nebular/chat',
+      },
     ],
   },
   {

From 168cc6ac68319ab04811fe5ba562e812911f2659 Mon Sep 17 00:00:00 2001
From: denStrigo <d.strigo@akveo.com>
Date: Wed, 14 Nov 2018 16:42:20 +0300
Subject: [PATCH 06/11] feat(components): update styles for nebular components

---
 src/app/@theme/theme.module.ts                |   2 +
 .../accordion/accordion.component.html        |   2 +-
 .../pages/nebular/alert/alert.component.html  |   7 +-
 .../datepicker/datepicker.component.html      |  51 +-
 .../datepicker/datepicker.component.scss      |   4 +
 .../nebular/dialog/dialog.component.html      | 112 +--
 .../nebular/dialog/dialog.component.scss      |  12 +-
 .../showcase-dialog.component.html            |   2 +-
 .../showcase-dialog.component.scss            |   4 +
 .../nebular-inputs.component.html             |  81 ++-
 .../nebular-select.component.html             | 644 ++++++++++--------
 .../nebular-select.component.scss             |   8 +-
 .../nebular-select.component.ts               |   5 -
 .../infinite-list.component.html              |  68 +-
 .../infinite-list.component.scss              |   9 -
 .../pages/nebular/list/list.component.html    |  40 +-
 .../pages/nebular/list/list.component.scss    |  11 -
 .../pages/nebular/nebular-routing.module.ts   |   5 +
 src/app/pages/nebular/nebular.module.ts       |   2 +
 .../spinner-color.component.html              |   3 -
 .../spinner-in-buttons.component.html         |  32 +-
 .../spinner-in-buttons.component.scss         |   5 +
 .../spinner-in-buttons.component.ts           |  16 +-
 .../spinner-sizes.component.html              |   3 -
 .../nebular/tooltip/tooltip.component.html    |   3 +
 .../nebular/tooltip/tooltip.component.scss    |   5 +
 .../nebular/tooltip/tooltip.component.ts      |  10 +
 .../nebular/window/window.component.html      |  34 +-
 src/app/pages/pages-menu.ts                   |   4 +-
 29 files changed, 675 insertions(+), 509 deletions(-)
 create mode 100644 src/app/pages/nebular/tooltip/tooltip.component.html
 create mode 100644 src/app/pages/nebular/tooltip/tooltip.component.scss
 create mode 100644 src/app/pages/nebular/tooltip/tooltip.component.ts

diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts
index 495a1f452e..7b9a3eb76b 100644
--- a/src/app/@theme/theme.module.ts
+++ b/src/app/@theme/theme.module.ts
@@ -34,6 +34,7 @@ import {
   NbRadioModule,
   NbSelectModule,
   NbChatModule,
+  NbTooltipModule,
 } from '@nebular/theme';
 
 import { NbSecurityModule } from '@nebular/security';
@@ -100,6 +101,7 @@ const NB_MODULES = [
   NbRadioModule,
   NbSelectModule,
   NbChatModule,
+  NbTooltipModule,
 ];
 
 const COMPONENTS = [
diff --git a/src/app/pages/nebular/accordion/accordion.component.html b/src/app/pages/nebular/accordion/accordion.component.html
index e6cea2d9d0..e50ea8fd15 100644
--- a/src/app/pages/nebular/accordion/accordion.component.html
+++ b/src/app/pages/nebular/accordion/accordion.component.html
@@ -1,7 +1,7 @@
 <div class="accordions-container row">
   <div class="accordion-container col-md-12 col-lg-6 col-xxxl-6">
     <nb-card>
-      <nb-card-header>Toggle Accordion by button</nb-card-header>
+      <nb-card-header>Toggle Accordion By Button</nb-card-header>
       <nb-card-body>
         <button nbButton (click)="toggle()">Toggle First Item</button>
       </nb-card-body>
diff --git a/src/app/pages/nebular/alert/alert.component.html b/src/app/pages/nebular/alert/alert.component.html
index 435f911ca7..fc51385830 100644
--- a/src/app/pages/nebular/alert/alert.component.html
+++ b/src/app/pages/nebular/alert/alert.component.html
@@ -2,7 +2,7 @@
   <nb-card-header>Alert</nb-card-header>
 </nb-card>
 <div class="row">
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
+  <div class="col-md-12 col-lg-4 col-xxxl-4">
     <nb-card>
       <nb-card-header>Colored Alert</nb-card-header>
       <nb-card-body>
@@ -15,7 +15,9 @@
         <nb-alert status="disabled">You have been successfully authenticated!</nb-alert>
       </nb-card-body>
     </nb-card>
+  </div>
 
+  <div class="col-md-12 col-lg-4 col-xxxl-4">
     <nb-card>
       <nb-card-header>Outline Alert</nb-card-header>
       <nb-card-body>
@@ -29,7 +31,8 @@
       </nb-card-body>
     </nb-card>
   </div>
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
+
+  <div class="col-md-12 col-lg-4 col-xxxl-4">
     <nb-card>
       <nb-card-header>Accent Alert</nb-card-header>
       <nb-card-body>
diff --git a/src/app/pages/nebular/datepicker/datepicker.component.html b/src/app/pages/nebular/datepicker/datepicker.component.html
index 9b40152dcd..ab3428abf9 100644
--- a/src/app/pages/nebular/datepicker/datepicker.component.html
+++ b/src/app/pages/nebular/datepicker/datepicker.component.html
@@ -1,21 +1,38 @@
 <nb-card>
   <nb-card-header>
-    Datepicker
+    Datepickers
   </nb-card-header>
-  <nb-card-body>
-    <div>
-      <input nbInput
-             placeholder="Form Picker"
-             [nbDatepicker]="formpicker">
-      <nb-datepicker #formpicker></nb-datepicker>
-    </div>
-    <div>
-      <input nbInput placeholder="Range Picker" [nbDatepicker]="rangepicker">
-      <nb-rangepicker #rangepicker></nb-rangepicker>
-    </div>
-    <div>
-      <input nbInput placeholder="Min Max Picker" [nbDatepicker]="picker">
-      <nb-datepicker #picker [min]="min" [max]="max"></nb-datepicker>
-    </div>
-  </nb-card-body>
 </nb-card>
+
+<div class="row">
+  <div class="col-md-12 col-lg-4 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Common Datepicker</nb-card-header>
+      <nb-card-body>
+        <input nbInput
+               placeholder="Form Picker"
+               [nbDatepicker]="formpicker">
+        <nb-datepicker #formpicker></nb-datepicker>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-4 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Datepicker With Rang</nb-card-header>
+      <nb-card-body>
+        <input nbInput placeholder="Range Picker" [nbDatepicker]="rangepicker">
+        <nb-rangepicker #rangepicker></nb-rangepicker>
+      </nb-card-body>
+    </nb-card>
+  </div>
+  <div class="col-md-12 col-lg-4 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Datepicker With Disabled Min Max Values</nb-card-header>
+      <nb-card-body>
+        <input nbInput placeholder="Min Max Picker" [nbDatepicker]="picker">
+        <nb-datepicker #picker [min]="min" [max]="max"></nb-datepicker>
+      </nb-card-body>
+    </nb-card>
+  </div>
+</div>
diff --git a/src/app/pages/nebular/datepicker/datepicker.component.scss b/src/app/pages/nebular/datepicker/datepicker.component.scss
index df3983ede6..96f55076c3 100644
--- a/src/app/pages/nebular/datepicker/datepicker.component.scss
+++ b/src/app/pages/nebular/datepicker/datepicker.component.scss
@@ -4,5 +4,9 @@
   nb-card-body {
     display: flex;
     justify-content: space-between;
+
+    input {
+      width: 100%;
+    }
   }
 }
diff --git a/src/app/pages/nebular/dialog/dialog.component.html b/src/app/pages/nebular/dialog/dialog.component.html
index 75dc8b1203..f25fb14324 100644
--- a/src/app/pages/nebular/dialog/dialog.component.html
+++ b/src/app/pages/nebular/dialog/dialog.component.html
@@ -2,44 +2,76 @@
   <nb-card-header>
     Dialog
   </nb-card-header>
-  <nb-card-body>
-    <div>
-      <button nbButton (click)="open()">Open Dialog</button>
-    </div>
-
-    <div>
-      <button nbButton (click)="open2(dialog)">Open Dialog with template</button>
-    </div>
-
-    <div>
-      <button nbButton (click)="open3()">Enter Name</button>
-      <br>
-      <h3 class="title">Names:</h3>
-      <ul>
-        <li *ngFor="let name of names">{{ name }}</li>
-      </ul>
-    </div>
-
-    <div>
-      <button nbButton hero (click)="openWithoutBackdrop(dialog)">Open without backdrop</button>
-    </div>
-
-    <div>
-      <button nbButton hero (click)="openWithoutBackdropClick(dialog)">Open without backdrop</button>
-    </div>
-
-    <div>
-      <button nbButton hero (click)="openWithoutEscClose(dialog)">Open without backdrop</button>
-    </div>
-
-    <ng-template #dialog let-data let-ref="dialogRef">
-      <nb-card>
-        <nb-card-header>Template Dialog</nb-card-header>
-        <nb-card-body>{{ data }}</nb-card-body>
-        <nb-card-footer>
-          <button nbButton (click)="ref.close()">Close Dialog</button>
-        </nb-card-footer>
-      </nb-card>
-    </ng-template>
-  </nb-card-body>
 </nb-card>
+
+<div class="row">
+  <div class="col-md-12 col-lg-4 col-xxxl-3">
+    <nb-card>
+      <nb-card-header>Open Dialog</nb-card-header>
+      <nb-card-body>
+        <button nbButton (click)="open()">Open Dialog</button>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-4 col-xxxl-3">
+    <nb-card>
+      <nb-card-header>Dialog With Template</nb-card-header>
+      <nb-card-body>
+        <button nbButton (click)="open2(dialog)">Open Dialog with template</button>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-4 col-xxxl-3">
+    <nb-card>
+      <nb-card-header>Open Without Backdrop</nb-card-header>
+      <nb-card-body>
+        <button nbButton (click)="openWithoutBackdrop(dialog)">Open without backdrop</button>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-4 col-xxxl-3">
+    <nb-card>
+      <nb-card-header>Open Without Esc Close</nb-card-header>
+      <nb-card-body>
+        <button nbButton (click)="openWithoutEscClose(dialog)">Open without esc close</button>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-4 col-xxxl-3">
+    <nb-card>
+      <nb-card-header>Open Without Backdrop Click</nb-card-header>
+      <nb-card-body>
+        <button nbButton (click)="openWithoutBackdropClick(dialog)">Open without backdrop click</button>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-4 col-xxxl-3">
+    <nb-card class="form-input-card">
+      <nb-card-header>Return Result From Dialog</nb-card-header>
+      <nb-card-body class="result-from-dialog">
+        <button nbButton (click)="open3()">Enter Name</button>
+        <br>
+        <h3 class="title">Names:</h3>
+        <ul>
+          <li *ngFor="let name of names">{{ name }}</li>
+        </ul>
+      </nb-card-body>
+    </nb-card>
+  </div>
+</div>
+
+<ng-template #dialog let-data let-ref="dialogRef">
+  <nb-card>
+    <nb-card-header>Template Dialog</nb-card-header>
+    <nb-card-body>{{ data }}</nb-card-body>
+    <nb-card-footer>
+      <button nbButton (click)="ref.close()">Close Dialog</button>
+    </nb-card-footer>
+  </nb-card>
+</ng-template>
+
diff --git a/src/app/pages/nebular/dialog/dialog.component.scss b/src/app/pages/nebular/dialog/dialog.component.scss
index a9b40a6a45..91429c9612 100644
--- a/src/app/pages/nebular/dialog/dialog.component.scss
+++ b/src/app/pages/nebular/dialog/dialog.component.scss
@@ -7,6 +7,16 @@
   }
 
   .title {
-    margin-top: 1rem;
+    margin-top: 2rem;
+  }
+
+  .result-from-dialog {
+    flex-direction: column;
+  }
+
+  .form-input-card {
+    nb-card-body {
+      display: block;
+    }
   }
 }
diff --git a/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.html b/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.html
index 403a979220..4cd3db631e 100644
--- a/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.html
+++ b/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.html
@@ -1,4 +1,4 @@
-<nb-card [style.width.px]="600" [style.height.px]="500">
+<nb-card>
   <nb-card-header>{{ title }}</nb-card-header>
   <nb-card-body>
     Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras convallis tincidunt tincidunt.
diff --git a/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.scss b/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.scss
index b447a8ce61..e65460404c 100644
--- a/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.scss
+++ b/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.scss
@@ -1,4 +1,8 @@
 @import '../../../../@theme/styles/themes';
 
 @include nb-install-component() {
+  nb-card {
+    max-width: 600px;
+    max-height: 500px;
+  }
 }
diff --git a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
index 6078e10436..082ceace2b 100644
--- a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
+++ b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
@@ -1,33 +1,56 @@
-<nb-card>
-  <nb-card-header>Nebular Inputs</nb-card-header>
-  <nb-card-body>
-    <input type="text" nbInput placeholder="Initial width">
-    <input type="text" nbInput fullWidth placeholder="Full width">
-    <textarea nbInput placeholder="Initial width"></textarea>
-    <textarea nbInput fullWidth placeholder="Full width"></textarea>
-  </nb-card-body>
+<div class="row">
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <nb-card>
+      <nb-card-header>Input Elements</nb-card-header>
+      <nb-card-body>
+        <input type="text" nbInput fullWidth fieldSize="small" placeholder="Input">
+        <textarea nbInput fullWidth shape="round" placeholder="Textarea"></textarea>
+      </nb-card-body>
+    </nb-card>
+  </div>
 
-  <nb-card-body>
-    <input type="text" nbInput fullWidth fieldSize="small" placeholder="Input">
-    <textarea nbInput fullWidth shape="round" placeholder="Textarea"></textarea>
-  </nb-card-body>
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <nb-card>
+      <nb-card-header>Input Shapes</nb-card-header>
+      <nb-card-body>
+        <input type="text" nbInput fullWidth shape="rectangle" placeholder="Rectangle">
+        <input type="text" nbInput fullWidth shape="semi-round" placeholder="Semi round">
+        <input type="text" nbInput fullWidth shape="round" placeholder="Round">
+      </nb-card-body>
+    </nb-card>
+  </div>
 
-  <nb-card-body>
-    <input type="text" nbInput fullWidth shape="rectangle" placeholder="Rectangle">
-    <input type="text" nbInput fullWidth shape="semi-round" placeholder="Semi round">
-    <input type="text" nbInput fullWidth shape="round" placeholder="Round">
-  </nb-card-body>
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <nb-card>
+      <nb-card-header>Full Width Inputs</nb-card-header>
+      <nb-card-body>
+        <input type="text" nbInput placeholder="Initial width">
+        <input type="text" nbInput fullWidth placeholder="Full width">
+        <textarea nbInput placeholder="Initial width"></textarea>
+        <textarea nbInput fullWidth placeholder="Full width"></textarea>
+      </nb-card-body>
+    </nb-card>
+  </div>
 
-  <nb-card-body>
-    <input type="text" nbInput fullWidth fieldSize="small" placeholder="Small">
-    <input type="text" nbInput fullWidth fieldSize="medium" placeholder="Medium">
-    <input type="text" nbInput fullWidth fieldSize="large" placeholder="Large">
-  </nb-card-body>
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <nb-card>
+      <nb-card-header>Input Elements</nb-card-header>
+      <nb-card-body>
+        <input type="text" nbInput fullWidth fieldSize="small" placeholder="Input">
+        <textarea nbInput fullWidth shape="round" placeholder="Textarea"></textarea>
+      </nb-card-body>
+    </nb-card>
+  </div>
 
-  <nb-card-body>
-    <input type="text" nbInput fullWidth status="info" placeholder="Info">
-    <input type="text" nbInput fullWidth status="success" placeholder="Success">
-    <input type="text" nbInput fullWidth status="warning" placeholder="Warning">
-    <input type="text" nbInput fullWidth status="danger" placeholder="Danger">
-  </nb-card-body>
-</nb-card>
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <nb-card>
+      <nb-card-header>Input Colors</nb-card-header>
+      <nb-card-body>
+        <input type="text" nbInput fullWidth status="info" placeholder="Info">
+        <input type="text" nbInput fullWidth status="success" placeholder="Success">
+        <input type="text" nbInput fullWidth status="warning" placeholder="Warning">
+        <input type="text" nbInput fullWidth status="danger" placeholder="Danger">
+      </nb-card-body>
+    </nb-card>
+  </div>
+</div>
diff --git a/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.html b/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.html
index e87f6d2194..487a96b246 100644
--- a/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.html
+++ b/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.html
@@ -1,300 +1,344 @@
-<nb-card>
-  <nb-card-header>Nebular Select</nb-card-header>
-  <nb-card-body>
-    <nb-select placeholder="Select Showcase" [(selected)]="commonSelectedItem">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-  </nb-card-body>
-
-  <nb-card-body>
-    <nb-select multiple placeholder="Multiple Select">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-  </nb-card-body>
-
-  <nb-card-body>
-    <nb-select placeholder="Cleanable">
-      <nb-option>Clean</nb-option>
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-  </nb-card-body>
-
-  <nb-card-body class="select-form-binding">
-    <nb-select placeholder="NgModel" [(ngModel)]="selectedItemNgModel">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Form control" [formControl]="selectedItemFormControl">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-  </nb-card-body>
-
-  <nb-card-body class="select-grouping">
-    <nb-select placeholder="Select Groups">
-
-      <nb-option-group title="Group 1">
-        <nb-option value="1">Option 1</nb-option>
-        <nb-option value="2">Option 2</nb-option>
-        <nb-option value="3">Option 3</nb-option>
-        <nb-option value="4">Option 4</nb-option>
-      </nb-option-group>
-
-      <nb-option-group title="Group 2">
-        <nb-option value="21">Option 21</nb-option>
-        <nb-option value="22">Option 22</nb-option>
-        <nb-option value="23">Option 23</nb-option>
-        <nb-option value="24">Option 24</nb-option>
-      </nb-option-group>
-
-      <nb-option-group title="Group 3">
-        <nb-option value="31">Option 31</nb-option>
-        <nb-option value="32">Option 32</nb-option>
-        <nb-option value="33">Option 33</nb-option>
-        <nb-option value="34">Option 34</nb-option>
-      </nb-option-group>
-
-    </nb-select>
-  </nb-card-body>
-
-  <nb-card-body>
-    <nb-select placeholder="Placeholder" status="primary">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-  </nb-card-body>
-
-  <nb-card-body class="select-disabled">
-    <nb-select disabled placeholder="Disabled">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Disabled Items">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2" disabled>Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4" disabled>Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Disabled Groups">
-
-      <nb-option-group title="Group 1">
-        <nb-option value="1">Option 1</nb-option>
-        <nb-option value="2" disabled>Option 2</nb-option>
-        <nb-option value="3">Option 3</nb-option>
-        <nb-option value="4">Option 4</nb-option>
-      </nb-option-group>
-
-      <nb-option-group title="Group 2" disabled>
-        <nb-option value="21">Option 21</nb-option>
-        <nb-option value="22">Option 22</nb-option>
-        <nb-option value="23">Option 23</nb-option>
-        <nb-option value="24">Option 24</nb-option>
-      </nb-option-group>
-
-      <nb-option-group title="Group 3">
-        <nb-option value="31">Option 31</nb-option>
-        <nb-option value="32">Option 32</nb-option>
-        <nb-option value="33">Option 33</nb-option>
-        <nb-option value="34">Option 34</nb-option>
-      </nb-option-group>
-
-    </nb-select>
-  </nb-card-body>
-
-  <nb-card-body>
-    <nb-select placeholder="Custom label" [(selected)]="selectedItem">
-      <nb-select-label>
-        Selected: {{ selectedItem }}
-      </nb-select-label>
-
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-  </nb-card-body>
-
-  <nb-card-body class="select-statuses">
-    <nb-select placeholder="Primary" status="primary">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Info" status="info">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Danger" status="danger">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Success" status="success">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Warning" status="warning">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-  </nb-card-body>
-
-  <nb-card-body class="select-sizes">
-    <nb-select placeholder="XSmall" size="xsmall">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Small" size="small">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Medium" size="medium">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Large" size="large">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-  </nb-card-body>
-
-  <nb-card-body class="select-outline">
-    <nb-select placeholder="Primary" outline status="primary">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Info" outline status="info">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Danger" outline status="danger">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Success" outline status="success">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Warning" outline status="warning">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-  </nb-card-body>
-
-  <nb-card-body class="select-color">
-    <nb-select placeholder="Primary" hero status="primary">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Info" hero status="info">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Danger" hero status="danger">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Success" hero status="success">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Warning" hero status="warning">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-  </nb-card-body>
-
-  <nb-card-body class="select-shape">
-    <nb-select placeholder="Round" shape="round">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Rectangle" shape="rectangle">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-
-    <nb-select placeholder="Semi-round" shape="semi-round">
-      <nb-option value="1">Option 1</nb-option>
-      <nb-option value="2">Option 2</nb-option>
-      <nb-option value="3">Option 3</nb-option>
-      <nb-option value="4">Option 4</nb-option>
-    </nb-select>
-  </nb-card-body>
-</nb-card>
+<div class="row">
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Select</nb-card-header>
+      <nb-card-body>
+        <nb-select placeholder="Select Showcase" [(selected)]="commonSelectedItem">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Multiple Select</nb-card-header>
+      <nb-card-body>
+        <nb-select multiple placeholder="Multiple Select">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Cleanable</nb-card-header>
+      <nb-card-body>
+        <nb-select placeholder="Cleanable">
+          <nb-option>Clean</nb-option>
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Placeholder</nb-card-header>
+      <nb-card-body>
+        <nb-select placeholder="Placeholder" status="primary">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Custom Label</nb-card-header>
+      <nb-card-body>
+        <nb-select placeholder="Custom Label" [(selected)]="selectedItem">
+          <nb-select-label>
+            Selected: {{ selectedItem }}
+          </nb-select-label>
+
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Select Groups</nb-card-header>
+      <nb-card-body>
+        <nb-select placeholder="Select Groups">
+
+          <nb-option-group title="Group 1">
+            <nb-option value="1">Option 1</nb-option>
+            <nb-option value="2">Option 2</nb-option>
+            <nb-option value="3">Option 3</nb-option>
+            <nb-option value="4">Option 4</nb-option>
+          </nb-option-group>
+
+          <nb-option-group title="Group 2">
+            <nb-option value="21">Option 21</nb-option>
+            <nb-option value="22">Option 22</nb-option>
+            <nb-option value="23">Option 23</nb-option>
+            <nb-option value="24">Option 24</nb-option>
+          </nb-option-group>
+
+          <nb-option-group title="Group 3">
+            <nb-option value="31">Option 31</nb-option>
+            <nb-option value="32">Option 32</nb-option>
+            <nb-option value="33">Option 33</nb-option>
+            <nb-option value="34">Option 34</nb-option>
+          </nb-option-group>
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Disabled Select</nb-card-header>
+      <nb-card-body class="select-group">
+        <nb-select disabled placeholder="Disabled">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Disabled Items">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2" disabled>Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4" disabled>Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Disabled Groups">
+
+          <nb-option-group title="Group 1">
+            <nb-option value="1">Option 1</nb-option>
+            <nb-option value="2" disabled>Option 2</nb-option>
+            <nb-option value="3">Option 3</nb-option>
+            <nb-option value="4">Option 4</nb-option>
+          </nb-option-group>
+
+          <nb-option-group title="Group 2" disabled>
+            <nb-option value="21">Option 21</nb-option>
+            <nb-option value="22">Option 22</nb-option>
+            <nb-option value="23">Option 23</nb-option>
+            <nb-option value="24">Option 24</nb-option>
+          </nb-option-group>
+
+          <nb-option-group title="Group 3">
+            <nb-option value="31">Option 31</nb-option>
+            <nb-option value="32">Option 32</nb-option>
+            <nb-option value="33">Option 33</nb-option>
+            <nb-option value="34">Option 34</nb-option>
+          </nb-option-group>
+
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Select Shapes</nb-card-header>
+      <nb-card-body class="select-group">
+        <nb-select placeholder="Round" shape="round">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Rectangle" shape="rectangle">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Semi-round" shape="semi-round">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Select Sizes</nb-card-header>
+      <nb-card-body class="select-group">
+        <nb-select placeholder="XSmall" size="xsmall">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Small" size="small">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Medium" size="medium">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Large" size="large">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Select Statuses</nb-card-header>
+      <nb-card-body class="select-group">
+        <nb-select placeholder="Primary" status="primary">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Info" status="info">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Danger" status="danger">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Success" status="success">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Warning" status="warning">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Outline Select</nb-card-header>
+      <nb-card-body class="select-group">
+        <nb-select placeholder="Primary" outline status="primary">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Info" outline status="info">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Danger" outline status="danger">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Success" outline status="success">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Warning" outline status="warning">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Select Colors</nb-card-header>
+      <nb-card-body class="select-group">
+        <nb-select placeholder="Primary" hero status="primary">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Info" hero status="info">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Danger" hero status="danger">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Success" hero status="success">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+
+        <nb-select placeholder="Warning" hero status="warning">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+          <nb-option value="3">Option 3</nb-option>
+          <nb-option value="4">Option 4</nb-option>
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+  </div>
+</div>
diff --git a/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.scss b/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.scss
index 45bfb3cf71..4380983844 100644
--- a/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.scss
+++ b/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.scss
@@ -6,13 +6,7 @@
     width: 15rem;
   }
 
-  .select-form-binding,
-  .select-disabled,
-  .select-statuses,
-  .select-sizes,
-  .select-outline,
-  .select-color,
-  .select-shape {
+  .select-group {
     nb-select {
       margin-right: 0.75rem;
       margin-bottom: 1rem;
diff --git a/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.ts b/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.ts
index 870bce900c..41cd29f646 100644
--- a/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.ts
+++ b/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.ts
@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-import { FormControl } from '@angular/forms';
 
 @Component({
   selector: 'ngx-nebular-select',
@@ -9,9 +8,5 @@ import { FormControl } from '@angular/forms';
 export class NebularSelectComponent {
 
   commonSelectedItem = '2';
-
-  selectedItemNgModel;
-  selectedItemFormControl = new FormControl();
-
   selectedItem;
 }
diff --git a/src/app/pages/nebular/infinite-list/infinite-list.component.html b/src/app/pages/nebular/infinite-list/infinite-list.component.html
index 682c733a6d..ec4091d8b7 100644
--- a/src/app/pages/nebular/infinite-list/infinite-list.component.html
+++ b/src/app/pages/nebular/infinite-list/infinite-list.component.html
@@ -2,39 +2,39 @@
   <nb-card-header>Infinite List</nb-card-header>
 </nb-card>
 
-<div class="infinite-cards">
-  <nb-card class="own-scroll">
-    <nb-card-header>
-      Own scroll
-    </nb-card-header>
-    <nb-list
-      nbInfiniteList
-      [threshold]="500"
-      (bottomThreshold)="loadNext(firstCard)">
-      <nb-list-item *ngFor="let newsPost of firstCard.news">
-        <ngx-news-post [post]="newsPost"></ngx-news-post>
-      </nb-list-item>
-      <nb-list-item *ngFor="let _ of firstCard.placeholders">
-        <ngx-news-post-placeholder></ngx-news-post-placeholder>
-      </nb-list-item>
-    </nb-list>
-  </nb-card>
+<div class="infinite-cards row">
+  <div class="col-md-12 col-lg-6 col-xxxl-6">
+    <nb-card class="own-scroll">
+      <nb-card-header>Own Scroll</nb-card-header>
+      <nb-list
+        nbInfiniteList
+        [threshold]="500"
+        (bottomThreshold)="loadNext(firstCard)">
+        <nb-list-item *ngFor="let newsPost of firstCard.news">
+          <ngx-news-post [post]="newsPost"></ngx-news-post>
+        </nb-list-item>
+        <nb-list-item *ngFor="let _ of firstCard.placeholders">
+          <ngx-news-post-placeholder></ngx-news-post-placeholder>
+        </nb-list-item>
+      </nb-list>
+    </nb-card>
+  </div>
 
-  <nb-card>
-    <nb-card-header>
-      Window scroll
-    </nb-card-header>
-    <nb-list
-      nbInfiniteList
-      listenWindowScroll
-      [threshold]="500"
-      (bottomThreshold)="loadNext(secondCard)">
-      <nb-list-item *ngFor="let newsPost of secondCard.news">
-        <ngx-news-post [post]="newsPost"></ngx-news-post>
-      </nb-list-item>
-      <nb-list-item *ngFor="let _ of secondCard.placeholders">
-        <ngx-news-post-placeholder></ngx-news-post-placeholder>
-      </nb-list-item>
-    </nb-list>
-  </nb-card>
+  <div class="col-md-12 col-lg-6 col-xxxl-6">
+    <nb-card>
+      <nb-card-header>Window Scroll</nb-card-header>
+      <nb-list
+        nbInfiniteList
+        listenWindowScroll
+        [threshold]="500"
+        (bottomThreshold)="loadNext(secondCard)">
+        <nb-list-item *ngFor="let newsPost of secondCard.news">
+          <ngx-news-post [post]="newsPost"></ngx-news-post>
+        </nb-list-item>
+        <nb-list-item *ngFor="let _ of secondCard.placeholders">
+          <ngx-news-post-placeholder></ngx-news-post-placeholder>
+        </nb-list-item>
+      </nb-list>
+    </nb-card>
+  </div>
 </div>
diff --git a/src/app/pages/nebular/infinite-list/infinite-list.component.scss b/src/app/pages/nebular/infinite-list/infinite-list.component.scss
index c6a6ce6fc5..ebc87160d7 100644
--- a/src/app/pages/nebular/infinite-list/infinite-list.component.scss
+++ b/src/app/pages/nebular/infinite-list/infinite-list.component.scss
@@ -2,16 +2,7 @@
 
 @include nb-install-component() {
   .infinite-cards {
-    display: flex;
-
     nb-card {
-      flex: 1 1 45%;
-      margin-left: 2.5%;
-
-      &:first-child {
-        margin-left: 0;
-      }
-
       &.own-scroll {
         height: 50vh;
       }
diff --git a/src/app/pages/nebular/list/list.component.html b/src/app/pages/nebular/list/list.component.html
index e7adf0e393..3aadc084d8 100644
--- a/src/app/pages/nebular/list/list.component.html
+++ b/src/app/pages/nebular/list/list.component.html
@@ -2,25 +2,29 @@
   <nb-card-header>List</nb-card-header>
 </nb-card>
 
-<div class="lists">
-  <nb-card class="list-card">
-    <nb-card-header>Some fruits</nb-card-header>
-    <nb-card-body>
+<div class="lists row">
+  <div class="col-md-12 col-lg-6 col-xxxl-6">
+    <nb-card class="list-card">
+      <nb-card-header>Some Fruits</nb-card-header>
+      <nb-card-body>
+        <nb-list>
+          <nb-list-item *ngFor="let fruit of fruits">
+            {{ fruit }}
+          </nb-list-item>
+        </nb-list>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-6">
+    <nb-card class="list-card" size="small">
+      <nb-card-header>Users</nb-card-header>
       <nb-list>
-        <nb-list-item *ngFor="let fruit of fruits">
-          {{ fruit }}
+        <nb-list-item *ngFor="let user of users">
+          <nb-user [name]="user.name" [title]="user.title">
+          </nb-user>
         </nb-list-item>
       </nb-list>
-    </nb-card-body>
-  </nb-card>
-
-  <nb-card class="list-card" size="small">
-    <nb-card-header>Users</nb-card-header>
-    <nb-list>
-      <nb-list-item *ngFor="let user of users">
-        <nb-user [name]="user.name" [title]="user.title">
-        </nb-user>
-      </nb-list-item>
-    </nb-list>
-  </nb-card>
+    </nb-card>
+  </div>
 </div>
diff --git a/src/app/pages/nebular/list/list.component.scss b/src/app/pages/nebular/list/list.component.scss
index 42d0316881..683ca36874 100644
--- a/src/app/pages/nebular/list/list.component.scss
+++ b/src/app/pages/nebular/list/list.component.scss
@@ -1,18 +1,7 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  .lists {
-    display: flex;
-  }
-
   .list-card {
-    width: 20rem;
-    margin-left: 10rem;
-
-    &:first-child {
-      margin-left: 0;
-    }
-
     nb-card-header {
       border-bottom: none;
     }
diff --git a/src/app/pages/nebular/nebular-routing.module.ts b/src/app/pages/nebular/nebular-routing.module.ts
index 6b46a61d8b..3c3749d32b 100644
--- a/src/app/pages/nebular/nebular-routing.module.ts
+++ b/src/app/pages/nebular/nebular-routing.module.ts
@@ -16,6 +16,7 @@ import { ProgressBarComponent } from './progress-bar/progress-bar.component';
 import { SpinnerComponent } from './spinner/spinner.component';
 import { NebularFormInputsComponent } from './form-inputs/nebular-form-inputs.component';
 import { ChatComponent } from './chat/chat.component';
+import { TooltipComponent } from './tooltip/tooltip.component';
 
 const routes: Routes = [{
   path: '',
@@ -57,6 +58,10 @@ const routes: Routes = [{
       path: 'toastr',
       component: ToastrComponent,
     },
+    {
+      path: 'tooltip',
+      component: TooltipComponent,
+    },
     {
       path: 'alert',
       component: AlertComponent,
diff --git a/src/app/pages/nebular/nebular.module.ts b/src/app/pages/nebular/nebular.module.ts
index cbf5a4328d..52383986ba 100644
--- a/src/app/pages/nebular/nebular.module.ts
+++ b/src/app/pages/nebular/nebular.module.ts
@@ -36,6 +36,7 @@ import { NebularCheckboxComponent } from './form-inputs/nebular-checkbox/nebular
 import { NebularRadioGroupComponent } from './form-inputs/nebular-radio-group/nebular-radio-group.component';
 import { NebularSelectComponent } from './form-inputs/nebular-select/nebular-select.component';
 import { ChatComponent } from './chat/chat.component';
+import { TooltipComponent } from './tooltip/tooltip.component';
 
 // services
 import { NewsService } from './services/news.service';
@@ -73,6 +74,7 @@ const COMPONENTS = [
   NebularRadioGroupComponent,
   NebularSelectComponent,
   ChatComponent,
+  TooltipComponent,
 ];
 
 const ENTRY_COMPONENTS = [
diff --git a/src/app/pages/nebular/spinner/spinner-color/spinner-color.component.html b/src/app/pages/nebular/spinner/spinner-color/spinner-color.component.html
index 7a4a2646bd..0996f8408c 100644
--- a/src/app/pages/nebular/spinner/spinner-color/spinner-color.component.html
+++ b/src/app/pages/nebular/spinner/spinner-color/spinner-color.component.html
@@ -1,6 +1,3 @@
-<nb-card>
-  <nb-card-header>Spinner Color</nb-card-header>
-</nb-card>
 <nb-card [nbSpinner]="true" nbSpinnerStatus="active">
   <nb-card-body>
     Some card content.
diff --git a/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.html b/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.html
index 4a804144c0..58d137ced7 100644
--- a/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.html
+++ b/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.html
@@ -1,36 +1,36 @@
-<nb-card accent="primary" size="small">
+<nb-card>
   <nb-card-header>Button With Spinner</nb-card-header>
   <nb-card-body>
-    <div class="d-flex align-items-start">
-      <div class="size-large-group">
-        <button nbButton status="success" size="large" (click)="toggleLoadingAnimation()"
-                [nbSpinner]="loading" nbSpinnerStatus="success" nbSpinnerSize="large" nbSpinnerMessage="">
+    <div class="row">
+      <div class="col-md-12 col-lg-12 col-xxxl-12">
+        <button nbButton status="success" size="large" (click)="toggleLoadingLargeGroupAnimation()"
+                [nbSpinner]="loadingLargeGroup" nbSpinnerStatus="success" nbSpinnerSize="large" nbSpinnerMessage="">
           Download
         </button>
 
-        <button nbButton status="primary" size="large" (click)="toggleLoadingAnimation()"
-                [nbSpinner]="loading" nbSpinnerStatus="primary" nbSpinnerSize="large" nbSpinnerMessage="">
+        <button nbButton status="primary" size="large" (click)="toggleLoadingLargeGroupAnimation()"
+                [nbSpinner]="loadingLargeGroup" nbSpinnerStatus="primary" nbSpinnerSize="large" nbSpinnerMessage="">
           Download
         </button>
 
-        <button nbButton status="warning" size="large" (click)="toggleLoadingAnimation()"
-                [nbSpinner]="loading" nbSpinnerStatus="warning" nbSpinnerSize="large" nbSpinnerMessage="">
+        <button nbButton status="warning" size="large" (click)="toggleLoadingLargeGroupAnimation()"
+                [nbSpinner]="loadingLargeGroup" nbSpinnerStatus="warning" nbSpinnerSize="large" nbSpinnerMessage="">
           Download
         </button>
       </div>
-      <div class="size-medium-group">
-        <button nbButton status="danger" size="medium" (click)="toggleLoadingAnimation()"
-                [nbSpinner]="loading" nbSpinnerStatus="danger" nbSpinnerMessage="">
+      <div class="col-md-12 col-lg-12 col-xxxl-12 size-medium-group">
+        <button nbButton status="danger" size="medium" (click)="toggleLoadingMediumGroupAnimation()"
+                [nbSpinner]="loadingMediumGroup" nbSpinnerStatus="danger" nbSpinnerMessage="">
           Download
         </button>
 
-        <button nbButton status="info" size="medium" (click)="toggleLoadingAnimation()"
-                [nbSpinner]="loading" nbSpinnerStatus="info" nbSpinnerSize="small" nbSpinnerMessage="">
+        <button nbButton status="info" size="medium" (click)="toggleLoadingMediumGroupAnimation()"
+                [nbSpinner]="loadingMediumGroup" nbSpinnerStatus="info" nbSpinnerSize="small" nbSpinnerMessage="">
           Download
         </button>
 
-        <button nbButton status="info" size="medium" (click)="toggleLoadingAnimation()"
-                [nbSpinner]="loading" nbSpinnerStatus="info" nbSpinnerSize="xsmall" nbSpinnerMessage="">
+        <button nbButton status="primary" size="medium" (click)="toggleLoadingMediumGroupAnimation()"
+                [nbSpinner]="loadingMediumGroup" nbSpinnerStatus="primary" nbSpinnerSize="xsmall" nbSpinnerMessage="">
           Download
         </button>
       </div>
diff --git a/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.scss b/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
index d6028d3e5c..f43d9b812a 100644
--- a/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
+++ b/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
@@ -4,4 +4,9 @@
   button {
     margin: 1rem;
   }
+  
+  .size-medium-group {
+    margin-top: 2rem;
+    border-top: 1px solid nb-theme(separator);
+  }
 }
diff --git a/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.ts b/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.ts
index 0bd553c7a1..5c84dc1491 100644
--- a/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.ts
+++ b/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.ts
@@ -8,10 +8,18 @@ import { Component } from '@angular/core';
 
 export class SpinnerInButtonsComponent {
 
-  loading = false;
+  loadingLargeGroup = false;
+  loadingMediumGroup = false;
 
-  toggleLoadingAnimation() {
-    this.loading = true;
-    setTimeout(() => this.loading = false, 3000);
+  toggleLoadingLargeGroupAnimation() {
+    this.loadingLargeGroup = true;
+
+    setTimeout(() => this.loadingLargeGroup = false, 3000);
+  }
+
+  toggleLoadingMediumGroupAnimation() {
+    this.loadingMediumGroup = true;
+
+    setTimeout(() => this.loadingMediumGroup = false, 3000);
   }
 }
diff --git a/src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.html b/src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.html
index 71ddd11572..ad2099fc97 100644
--- a/src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.html
+++ b/src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.html
@@ -1,6 +1,3 @@
-<nb-card>
-  <nb-card-header>Spinner Sizes</nb-card-header>
-</nb-card>
 <nb-card [nbSpinner]="true" nbSpinnerSize="xxsmall">
   <nb-card-body>
     Some card content.
diff --git a/src/app/pages/nebular/tooltip/tooltip.component.html b/src/app/pages/nebular/tooltip/tooltip.component.html
new file mode 100644
index 0000000000..950ded9ad4
--- /dev/null
+++ b/src/app/pages/nebular/tooltip/tooltip.component.html
@@ -0,0 +1,3 @@
+<nb-card>
+  <nb-card-header>Tooltip</nb-card-header>
+</nb-card>
diff --git a/src/app/pages/nebular/tooltip/tooltip.component.scss b/src/app/pages/nebular/tooltip/tooltip.component.scss
new file mode 100644
index 0000000000..d5badf91b4
--- /dev/null
+++ b/src/app/pages/nebular/tooltip/tooltip.component.scss
@@ -0,0 +1,5 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+
+}
diff --git a/src/app/pages/nebular/tooltip/tooltip.component.ts b/src/app/pages/nebular/tooltip/tooltip.component.ts
new file mode 100644
index 0000000000..e1ed8223c6
--- /dev/null
+++ b/src/app/pages/nebular/tooltip/tooltip.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-tooltip',
+  templateUrl: 'tooltip.component.html',
+  styleUrls: ['tooltip.component.scss'],
+})
+export class TooltipComponent {
+
+}
diff --git a/src/app/pages/nebular/window/window.component.html b/src/app/pages/nebular/window/window.component.html
index 6be2da9cbe..6f71011448 100644
--- a/src/app/pages/nebular/window/window.component.html
+++ b/src/app/pages/nebular/window/window.component.html
@@ -2,14 +2,36 @@
   <nb-card-header>
     Window
   </nb-card-header>
-  <nb-card-body>
-    <button (click)="openWindowForm()" nbButton>Open window form</button>
+</nb-card>
 
-    <button (click)="openWindow(contentTemplate)" nbButton>Open window</button>
+<div class="row">
+  <div class="col-md-12 col-lg-4 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Window Form</nb-card-header>
+      <nb-card-body>
+        <button (click)="openWindowForm()" nbButton>Open window form</button>
+      </nb-card-body>
+    </nb-card>
+  </div>
 
-    <button (click)="openWindowWithoutBackdrop()" nbButton>Open window without backdrop</button>
-  </nb-card-body>
-</nb-card>
+  <div class="col-md-12 col-lg-4 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Window Template</nb-card-header>
+      <nb-card-body>
+        <button (click)="openWindow(contentTemplate)" nbButton>Open window</button>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-4 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Window Without Backdrop</nb-card-header>
+      <nb-card-body>
+        <button (click)="openWindowWithoutBackdrop()" nbButton>Open window without backdrop</button>
+      </nb-card-body>
+    </nb-card>
+  </div>
+</div>
 
 <ng-template #contentTemplate let-data>
   <p>Here is the text provided via config: "{{ data.title }}"</p>
diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts
index cf41abcf50..9f61dcbbe5 100644
--- a/src/app/pages/pages-menu.ts
+++ b/src/app/pages/pages-menu.ts
@@ -53,8 +53,8 @@ export const MENU_ITEMS: NbMenuItem[] = [
         link: '/pages/nebular/infinite-list',
       },
       {
-        title: 'Toastr',
-        link: '/pages/nebular/toastr',
+        title: 'Tooltip',
+        link: '/pages/nebular/tooltip',
       },
       {
         title: 'Alert',

From 60b0c290baf43fa0ce6c56fad0ec4dd3abd08782 Mon Sep 17 00:00:00 2001
From: denStrigo <d.strigo@akveo.com>
Date: Wed, 14 Nov 2018 17:07:11 +0300
Subject: [PATCH 07/11] feat(components): add nebular tooltip component

---
 .../nebular/tooltip/tooltip.component.html    | 40 ++++++++++++++++++-
 .../nebular/tooltip/tooltip.component.scss    |  4 +-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/nebular/tooltip/tooltip.component.html b/src/app/pages/nebular/tooltip/tooltip.component.html
index 950ded9ad4..0637d9aa82 100644
--- a/src/app/pages/nebular/tooltip/tooltip.component.html
+++ b/src/app/pages/nebular/tooltip/tooltip.component.html
@@ -1,3 +1,41 @@
 <nb-card>
-  <nb-card-header>Tooltip</nb-card-header>
+  <nb-card-header>Tooltips</nb-card-header>
 </nb-card>
+
+<div class="row">
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Tooltip With Icon</nb-card-header>
+      <nb-card-body>
+        <button nbTooltip="This is a tooltip" nbTooltipIcon="nb-home" nbButton>Show Tooltip</button>
+        <button nbTooltip="" nbTooltipIcon="nb-alert" nbTooltipStatus="danger" nbButton>Show Tooltip</button>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Tooltip Placements</nb-card-header>
+      <nb-card-body>
+        <button nbTooltip="This is a tooltip" nbTooltipPlacement="top" nbButton>Top</button>
+        <button nbTooltip="This is a tooltip" nbTooltipPlacement="right" nbButton>Right</button>
+        <button nbTooltip="This is a tooltip" nbTooltipPlacement="bottom" nbButton>Bottom</button>
+        <button nbTooltip="This is a tooltip" nbTooltipPlacement="left" nbButton>Left</button>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-md-12 col-lg-6 col-xxxl-4">
+    <nb-card>
+      <nb-card-header>Colored Tooltips</nb-card-header>
+      <nb-card-body>
+        <button nbTooltip="This is a tooltip" nbTooltipPlacement="top" nbButton>Default</button>
+        <button nbTooltip="This is a tooltip" nbTooltipPlacement="top" nbTooltipStatus="primary" nbButton>Primary</button>
+        <button nbTooltip="This is a tooltip" nbTooltipPlacement="top" nbTooltipStatus="success" nbButton>Success</button>
+        <button nbTooltip="This is a tooltip" nbTooltipPlacement="top" nbTooltipStatus="danger" nbButton>Danger</button>
+        <button nbTooltip="This is a tooltip" nbTooltipPlacement="top" nbTooltipStatus="info" nbButton>Info</button>
+        <button nbTooltip="This is a tooltip" nbTooltipPlacement="top" nbTooltipStatus="warning" nbButton>Warning</button>
+      </nb-card-body>
+    </nb-card>
+  </div>
+</div>
diff --git a/src/app/pages/nebular/tooltip/tooltip.component.scss b/src/app/pages/nebular/tooltip/tooltip.component.scss
index d5badf91b4..74aaf7a5c3 100644
--- a/src/app/pages/nebular/tooltip/tooltip.component.scss
+++ b/src/app/pages/nebular/tooltip/tooltip.component.scss
@@ -1,5 +1,7 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-
+  button {
+    margin: 0.5rem;
+  }
 }

From feb859df6bddaa5215f6e3accde0a161499b51e5 Mon Sep 17 00:00:00 2001
From: denStrigo <d.strigo@akveo.com>
Date: Wed, 14 Nov 2018 20:07:41 +0300
Subject: [PATCH 08/11] feat(components): update styles for nebular components

---
 .../pages/nebular/alert/alert.component.html  |  3 -
 .../nebular/calundar/calendar.component.html  | 12 ++--
 .../nebular/calundar/calendar.component.scss  |  4 +-
 .../chat-message-type.component.html          | 61 +++++++++++++++++++
 .../chat-message-type.component.scss          | 36 +++++++++++
 .../chat-message-type.component.ts            | 10 +++
 .../pages/nebular/chat/chat.component.html    | 43 +++++++------
 .../pages/nebular/chat/chat.component.scss    | 16 +++++
 .../datepicker/datepicker.component.html      |  6 --
 .../nebular/dialog/dialog.component.html      | 35 +++++------
 .../nebular/dialog/dialog.component.scss      | 30 +++++++--
 .../nebular-form-inputs.component.html        |  3 -
 .../nebular-inputs.component.html             | 10 +--
 .../infinite-list.component.html              |  4 --
 .../pages/nebular/list/list.component.html    |  4 --
 src/app/pages/nebular/nebular.module.ts       |  2 +
 .../progress-bar/progress-bar.component.html  |  3 -
 .../nebular/spinner/spinner.component.html    |  3 -
 .../nebular/stepper/stepper.component.html    |  4 --
 .../nebular/tooltip/tooltip.component.html    |  4 --
 .../nebular/window/window.component.html      | 21 ++-----
 .../nebular/window/window.component.scss      | 31 ++++++++++
 22 files changed, 234 insertions(+), 111 deletions(-)
 create mode 100644 src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.html
 create mode 100644 src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.scss
 create mode 100644 src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.ts

diff --git a/src/app/pages/nebular/alert/alert.component.html b/src/app/pages/nebular/alert/alert.component.html
index fc51385830..83e6c80f10 100644
--- a/src/app/pages/nebular/alert/alert.component.html
+++ b/src/app/pages/nebular/alert/alert.component.html
@@ -1,6 +1,3 @@
-<nb-card>
-  <nb-card-header>Alert</nb-card-header>
-</nb-card>
 <div class="row">
   <div class="col-md-12 col-lg-4 col-xxxl-4">
     <nb-card>
diff --git a/src/app/pages/nebular/calundar/calendar.component.html b/src/app/pages/nebular/calundar/calendar.component.html
index 2300bfef68..28ded2bb7d 100644
--- a/src/app/pages/nebular/calundar/calendar.component.html
+++ b/src/app/pages/nebular/calundar/calendar.component.html
@@ -1,21 +1,17 @@
-<nb-card>
-  <nb-card-header>Calendar</nb-card-header>
-</nb-card>
-
-<div class="calendars-container">
-  <div class="nebular-calendar">
+<div class="row">
+  <div class="nebular-calendar col-md-12 col-lg-6 col-xxxl-4">
     <h2>
       Selected date: {{ date | date }}
     </h2>
     <nb-calendar [(date)]="date" [boundingMonth]="true"></nb-calendar>
   </div>
-  <div class="nebular-calendar">
+  <div class="nebular-calendar col-md-12 col-lg-6 col-xxxl-4">
     <h2>
       Selected range: {{ range.start | date }} - {{ range.end | date }}
     </h2>
     <nb-calendar-range [(range)]="range"></nb-calendar-range>
   </div>
-  <div class="nebular-calendar">
+  <div class="nebular-calendar col-md-12 col-lg-6 col-xxxl-4">
     <h2>
       Selected date: {{ date2 | date }}
     </h2>
diff --git a/src/app/pages/nebular/calundar/calendar.component.scss b/src/app/pages/nebular/calundar/calendar.component.scss
index 7a3e05ee82..9b4a04ea88 100644
--- a/src/app/pages/nebular/calundar/calendar.component.scss
+++ b/src/app/pages/nebular/calundar/calendar.component.scss
@@ -6,14 +6,14 @@
   }
 
   h2 {
+    font-size: nb-theme(font-size-xlg);
     text-align: center;
   }
 
   .nebular-calendar {
-    margin-bottom: 3rem;
-    flex: 1;
     display: flex;
     flex-direction: column;
     align-items: center;
+    margin-bottom: 3rem;
   }
 }
diff --git a/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.html b/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.html
new file mode 100644
index 0000000000..71e3381f3c
--- /dev/null
+++ b/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.html
@@ -0,0 +1,61 @@
+<nb-chat title="Message Types" [size]="'xlarge'">
+  <nb-chat-message
+    message="Gif message"
+    type="file"
+    sender="John Doe"
+    [reply]="true"
+    [date]="date"
+    [files]="[ { url: 'http://www.reactiongifs.com/r/wnd1.gif', type: 'image/gif' } ]"
+    avatar="https://i.gifer.com/no.gif">
+  </nb-chat-message>
+  <nb-chat-message
+    message="Image message"
+    type="file"
+    sender="John Doe"
+    [reply]="true"
+    [date]="date"
+    [files]="[ { url: 'https://picsum.photos/320/240/?image=387', type: 'image/jpeg' } ]"
+    avatar="https://i.gifer.com/no.gif">
+  </nb-chat-message>
+  <nb-chat-message
+    message="Map message"
+    type="map"
+    sender="John Doe"
+    [reply]="true"
+    [date]="date"
+    [latitude]="53.914321"
+    [longitude]="27.5998355"
+    avatar="https://i.gifer.com/no.gif">
+  </nb-chat-message>
+  <nb-chat-message
+    message="File message"
+    type="file"
+    sender="John Doe"
+    [reply]="true"
+    [date]="date"
+    [files]="[ { url: 'http://google.com', icon: 'nb-compose' } ]"
+    [avatar]="'https://i.gifer.com/no.gif'">
+  </nb-chat-message>
+  <nb-chat-message
+    message="Quote message"
+    type="quote"
+    sender="John Doe"
+    [reply]="true"
+    quote="Quooted message here"
+    [date]="date"
+    avatar="https://i.gifer.com/no.gif">
+  </nb-chat-message>
+  <nb-chat-message
+    message="Group of files message"
+    type="file"
+    sender="John Doe"
+    [reply]="true"
+    [date]="date"
+    [files]="[
+          { url: 'http://google.com', icon: 'nb-compose' },
+          { url: 'https://picsum.photos/320/240/?image=387', type: 'image/jpeg' },
+          { url: 'http://www.reactiongifs.com/r/wnd1.gif', type: 'image/gif' }
+         ]"
+    avatar="https://i.gifer.com/no.gif">
+  </nb-chat-message>
+</nb-chat>
diff --git a/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.scss b/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.scss
new file mode 100644
index 0000000000..755ab7b642
--- /dev/null
+++ b/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.scss
@@ -0,0 +1,36 @@
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/breakpoints';
+
+@import '../../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  nb-card-body {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    align-items: center;
+  }
+
+  nb-chat {
+    width: 500px;
+    margin: 0 auto;
+  }
+
+  @include media-breakpoint-down(xxl) {
+    nb-chat {
+      width: 600px;
+    }
+  }
+
+  @include media-breakpoint-down(md) {
+    nb-chat {
+      width: 400px;
+    }
+  }
+
+  @include media-breakpoint-down(is) {
+    nb-chat {
+      width: 300px;
+    }
+  }
+}
diff --git a/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.ts b/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.ts
new file mode 100644
index 0000000000..072783a6a2
--- /dev/null
+++ b/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-chat-message-type',
+  templateUrl: 'chat-message-type.component.html',
+  styleUrls: ['chat-message-type.component.scss'],
+})
+export class ChatMessageTypeComponent {
+  date = new Date();
+}
diff --git a/src/app/pages/nebular/chat/chat.component.html b/src/app/pages/nebular/chat/chat.component.html
index 7bbddfbfcc..8b9cc93deb 100644
--- a/src/app/pages/nebular/chat/chat.component.html
+++ b/src/app/pages/nebular/chat/chat.component.html
@@ -1,20 +1,23 @@
-<nb-card>
-  <nb-card-header>Chat</nb-card-header>
-</nb-card>
-
-<nb-chat title="Nebular Conversational UI" size="large" status="success">
-  <nb-chat-message *ngFor="let msg of messages"
-                   [type]="msg.type"
-                   [message]="msg.text"
-                   [reply]="msg.reply"
-                   [sender]="msg.user.name"
-                   [date]="msg.date"
-                   [files]="msg.files"
-                   [quote]="msg.quote"
-                   [latitude]="msg.latitude"
-                   [longitude]="msg.longitude"
-                   [avatar]="msg.user.avatar">
-  </nb-chat-message>
-  <nb-chat-form (send)="sendMessage($event)" [dropFiles]="true">
-  </nb-chat-form>
-</nb-chat>
+<div class="row">
+  <div class="chat-container col-md-12 col-lg-12 col-xxxl-6">
+    <nb-chat title="Nebular Conversational UI" size="xlarge" status="success">
+      <nb-chat-message *ngFor="let msg of messages"
+                       [type]="msg.type"
+                       [message]="msg.text"
+                       [reply]="msg.reply"
+                       [sender]="msg.user.name"
+                       [date]="msg.date"
+                       [files]="msg.files"
+                       [quote]="msg.quote"
+                       [latitude]="msg.latitude"
+                       [longitude]="msg.longitude"
+                       [avatar]="msg.user.avatar">
+      </nb-chat-message>
+      <nb-chat-form (send)="sendMessage($event)" [dropFiles]="true">
+      </nb-chat-form>
+    </nb-chat>
+  </div>
+  <div class="chat-container col-md-12 col-lg-12 col-xxxl-6">
+    <ngx-chat-message-type></ngx-chat-message-type>
+  </div>
+</div>
diff --git a/src/app/pages/nebular/chat/chat.component.scss b/src/app/pages/nebular/chat/chat.component.scss
index 497f908a1d..74204da5d8 100644
--- a/src/app/pages/nebular/chat/chat.component.scss
+++ b/src/app/pages/nebular/chat/chat.component.scss
@@ -14,6 +14,22 @@
     width: 500px;
   }
 
+  .chat-container {
+    margin-bottom: 3rem;
+  }
+
+  @include media-breakpoint-down(xxl) {
+    nb-chat {
+      width: 600px;
+    }
+  }
+
+  @include media-breakpoint-down(md) {
+    nb-chat {
+      width: 400px;
+    }
+  }
+
   @include media-breakpoint-down(is) {
     nb-chat {
       width: 300px;
diff --git a/src/app/pages/nebular/datepicker/datepicker.component.html b/src/app/pages/nebular/datepicker/datepicker.component.html
index ab3428abf9..bf7f738e79 100644
--- a/src/app/pages/nebular/datepicker/datepicker.component.html
+++ b/src/app/pages/nebular/datepicker/datepicker.component.html
@@ -1,9 +1,3 @@
-<nb-card>
-  <nb-card-header>
-    Datepickers
-  </nb-card-header>
-</nb-card>
-
 <div class="row">
   <div class="col-md-12 col-lg-4 col-xxxl-4">
     <nb-card>
diff --git a/src/app/pages/nebular/dialog/dialog.component.html b/src/app/pages/nebular/dialog/dialog.component.html
index f25fb14324..655d03ae79 100644
--- a/src/app/pages/nebular/dialog/dialog.component.html
+++ b/src/app/pages/nebular/dialog/dialog.component.html
@@ -1,56 +1,49 @@
-<nb-card>
-  <nb-card-header>
-    Dialog
-  </nb-card-header>
-</nb-card>
-
 <div class="row">
-  <div class="col-md-12 col-lg-4 col-xxxl-3">
+  <div class="col-md-12 col-lg-6 col-xxxl-3">
     <nb-card>
       <nb-card-header>Open Dialog</nb-card-header>
       <nb-card-body>
-        <button nbButton (click)="open()">Open Dialog</button>
-      </nb-card-body>
-    </nb-card>
-  </div>
+        <button nbButton (click)="open()">Open Dialog with component</button>
 
-  <div class="col-md-12 col-lg-4 col-xxxl-3">
-    <nb-card>
-      <nb-card-header>Dialog With Template</nb-card-header>
-      <nb-card-body>
         <button nbButton (click)="open2(dialog)">Open Dialog with template</button>
       </nb-card-body>
     </nb-card>
   </div>
 
-  <div class="col-md-12 col-lg-4 col-xxxl-3">
+  <div class="col-md-12 col-lg-6 col-xxxl-3">
     <nb-card>
       <nb-card-header>Open Without Backdrop</nb-card-header>
       <nb-card-body>
-        <button nbButton (click)="openWithoutBackdrop(dialog)">Open without backdrop</button>
+        <button nbButton (click)="open()">Open Dialog with backdrop</button>
+
+        <button nbButton (click)="openWithoutBackdrop(dialog)">Open Dialog without backdrop</button>
       </nb-card-body>
     </nb-card>
   </div>
 
-  <div class="col-md-12 col-lg-4 col-xxxl-3">
+  <div class="col-md-12 col-lg-6 col-xxxl-3">
     <nb-card>
       <nb-card-header>Open Without Esc Close</nb-card-header>
       <nb-card-body>
-        <button nbButton (click)="openWithoutEscClose(dialog)">Open without esc close</button>
+        <button nbButton (click)="open()">Open Dialog with esc close</button>
+
+        <button nbButton (click)="openWithoutEscClose(dialog)">Open Dialog without esc close</button>
       </nb-card-body>
     </nb-card>
   </div>
 
-  <div class="col-md-12 col-lg-4 col-xxxl-3">
+  <div class="col-md-12 col-lg-6 col-xxxl-3">
     <nb-card>
       <nb-card-header>Open Without Backdrop Click</nb-card-header>
       <nb-card-body>
+        <button nbButton (click)="open()">Open Dialog with backdrop click</button>
+
         <button nbButton (click)="openWithoutBackdropClick(dialog)">Open without backdrop click</button>
       </nb-card-body>
     </nb-card>
   </div>
 
-  <div class="col-md-12 col-lg-4 col-xxxl-3">
+  <div class="col-md-12 col-lg-6 col-xxxl-3">
     <nb-card class="form-input-card">
       <nb-card-header>Return Result From Dialog</nb-card-header>
       <nb-card-body class="result-from-dialog">
diff --git a/src/app/pages/nebular/dialog/dialog.component.scss b/src/app/pages/nebular/dialog/dialog.component.scss
index 91429c9612..3941f02235 100644
--- a/src/app/pages/nebular/dialog/dialog.component.scss
+++ b/src/app/pages/nebular/dialog/dialog.component.scss
@@ -1,13 +1,21 @@
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/breakpoints';
+
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
   nb-card-body {
-    display: flex;
-    justify-content: space-between;
-  }
+    display: block;
+
+    button {
+      width: 100%;
+      margin-bottom: 2rem;
+      display: block;
 
-  .title {
-    margin-top: 2rem;
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
   }
 
   .result-from-dialog {
@@ -19,4 +27,16 @@
       display: block;
     }
   }
+
+  @include media-breakpoint-down(lg) {
+    button {
+      padding: 0.8rem;
+    }
+  }
+
+  @include media-breakpoint-down(is) {
+    button {
+      padding: 0.75rem;
+    }
+  }
 }
diff --git a/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.html b/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.html
index a6f80c2f31..d175270a23 100644
--- a/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.html
+++ b/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.html
@@ -1,6 +1,3 @@
-<nb-card>
-  <nb-card-header>Nebular Form Inputs</nb-card-header>
-</nb-card>
 <div class="row">
   <div class="col-md-12 col-lg-12 col-xxxl-6">
     <ngx-nebular-inputs></ngx-nebular-inputs>
diff --git a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
index 082ceace2b..2283ec8711 100644
--- a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
+++ b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
+  <div class="col-md-12 col-lg-6 col-xxxl-6">
     <nb-card>
       <nb-card-header>Input Elements</nb-card-header>
       <nb-card-body>
@@ -9,7 +9,7 @@
     </nb-card>
   </div>
 
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
+  <div class="col-md-12 col-lg-6 col-xxxl-6">
     <nb-card>
       <nb-card-header>Input Shapes</nb-card-header>
       <nb-card-body>
@@ -20,7 +20,7 @@
     </nb-card>
   </div>
 
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
+  <div class="col-md-12 col-lg-6 col-xxxl-6">
     <nb-card>
       <nb-card-header>Full Width Inputs</nb-card-header>
       <nb-card-body>
@@ -32,7 +32,7 @@
     </nb-card>
   </div>
 
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
+  <div class="col-md-12 col-lg-6 col-xxxl-6">
     <nb-card>
       <nb-card-header>Input Elements</nb-card-header>
       <nb-card-body>
@@ -42,7 +42,7 @@
     </nb-card>
   </div>
 
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
+  <div class="col-md-12 col-lg-6 col-xxxl-6">
     <nb-card>
       <nb-card-header>Input Colors</nb-card-header>
       <nb-card-body>
diff --git a/src/app/pages/nebular/infinite-list/infinite-list.component.html b/src/app/pages/nebular/infinite-list/infinite-list.component.html
index ec4091d8b7..340275d4ea 100644
--- a/src/app/pages/nebular/infinite-list/infinite-list.component.html
+++ b/src/app/pages/nebular/infinite-list/infinite-list.component.html
@@ -1,7 +1,3 @@
-<nb-card>
-  <nb-card-header>Infinite List</nb-card-header>
-</nb-card>
-
 <div class="infinite-cards row">
   <div class="col-md-12 col-lg-6 col-xxxl-6">
     <nb-card class="own-scroll">
diff --git a/src/app/pages/nebular/list/list.component.html b/src/app/pages/nebular/list/list.component.html
index 3aadc084d8..a11abe3c6e 100644
--- a/src/app/pages/nebular/list/list.component.html
+++ b/src/app/pages/nebular/list/list.component.html
@@ -1,7 +1,3 @@
-<nb-card>
-  <nb-card-header>List</nb-card-header>
-</nb-card>
-
 <div class="lists row">
   <div class="col-md-12 col-lg-6 col-xxxl-6">
     <nb-card class="list-card">
diff --git a/src/app/pages/nebular/nebular.module.ts b/src/app/pages/nebular/nebular.module.ts
index 52383986ba..cdac743976 100644
--- a/src/app/pages/nebular/nebular.module.ts
+++ b/src/app/pages/nebular/nebular.module.ts
@@ -37,6 +37,7 @@ import { NebularRadioGroupComponent } from './form-inputs/nebular-radio-group/ne
 import { NebularSelectComponent } from './form-inputs/nebular-select/nebular-select.component';
 import { ChatComponent } from './chat/chat.component';
 import { TooltipComponent } from './tooltip/tooltip.component';
+import { ChatMessageTypeComponent } from './chat/chat-message-type/chat-message-type.component';
 
 // services
 import { NewsService } from './services/news.service';
@@ -74,6 +75,7 @@ const COMPONENTS = [
   NebularRadioGroupComponent,
   NebularSelectComponent,
   ChatComponent,
+  ChatMessageTypeComponent,
   TooltipComponent,
 ];
 
diff --git a/src/app/pages/nebular/progress-bar/progress-bar.component.html b/src/app/pages/nebular/progress-bar/progress-bar.component.html
index cbfa21ed4c..2c06ec6631 100644
--- a/src/app/pages/nebular/progress-bar/progress-bar.component.html
+++ b/src/app/pages/nebular/progress-bar/progress-bar.component.html
@@ -1,6 +1,3 @@
-<nb-card>
-  <nb-card-header>Progress Bar</nb-card-header>
-</nb-card>
 <div class="row">
   <div class="col-md-12 col-lg-12 col-xxxl-6">
     <nb-card>
diff --git a/src/app/pages/nebular/spinner/spinner.component.html b/src/app/pages/nebular/spinner/spinner.component.html
index 974d093c74..bd06ec5c5c 100644
--- a/src/app/pages/nebular/spinner/spinner.component.html
+++ b/src/app/pages/nebular/spinner/spinner.component.html
@@ -1,6 +1,3 @@
-<nb-card>
-  <nb-card-header>Spinner</nb-card-header>
-</nb-card>
 <div class="row">
   <div class="col-md-12 col-lg-12 col-xxxl-6">
     <ngx-spinner-sizes></ngx-spinner-sizes>
diff --git a/src/app/pages/nebular/stepper/stepper.component.html b/src/app/pages/nebular/stepper/stepper.component.html
index ec220c4bac..86e0116cd3 100644
--- a/src/app/pages/nebular/stepper/stepper.component.html
+++ b/src/app/pages/nebular/stepper/stepper.component.html
@@ -1,7 +1,3 @@
-<nb-card>
-  <nb-card-header>Stepper</nb-card-header>
-</nb-card>
-
 <nb-card class="col-md-12 col-lg-12 col-xxxl-12">
   <nb-card-body>
     <nb-stepper orientation="horizontal">
diff --git a/src/app/pages/nebular/tooltip/tooltip.component.html b/src/app/pages/nebular/tooltip/tooltip.component.html
index 0637d9aa82..a9f234ea01 100644
--- a/src/app/pages/nebular/tooltip/tooltip.component.html
+++ b/src/app/pages/nebular/tooltip/tooltip.component.html
@@ -1,7 +1,3 @@
-<nb-card>
-  <nb-card-header>Tooltips</nb-card-header>
-</nb-card>
-
 <div class="row">
   <div class="col-md-12 col-lg-6 col-xxxl-4">
     <nb-card>
diff --git a/src/app/pages/nebular/window/window.component.html b/src/app/pages/nebular/window/window.component.html
index 6f71011448..fcefecc497 100644
--- a/src/app/pages/nebular/window/window.component.html
+++ b/src/app/pages/nebular/window/window.component.html
@@ -1,32 +1,21 @@
-<nb-card>
-  <nb-card-header>
-    Window
-  </nb-card-header>
-</nb-card>
-
 <div class="row">
-  <div class="col-md-12 col-lg-4 col-xxxl-4">
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
     <nb-card>
       <nb-card-header>Window Form</nb-card-header>
       <nb-card-body>
         <button (click)="openWindowForm()" nbButton>Open window form</button>
-      </nb-card-body>
-    </nb-card>
-  </div>
 
-  <div class="col-md-12 col-lg-4 col-xxxl-4">
-    <nb-card>
-      <nb-card-header>Window Template</nb-card-header>
-      <nb-card-body>
-        <button (click)="openWindow(contentTemplate)" nbButton>Open window</button>
+        <button (click)="openWindow(contentTemplate)" nbButton>Open window with template</button>
       </nb-card-body>
     </nb-card>
   </div>
 
-  <div class="col-md-12 col-lg-4 col-xxxl-4">
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
     <nb-card>
       <nb-card-header>Window Without Backdrop</nb-card-header>
       <nb-card-body>
+        <button (click)="openWindow(contentTemplate)" nbButton>Open window with backdrop</button>
+
         <button (click)="openWindowWithoutBackdrop()" nbButton>Open window without backdrop</button>
       </nb-card-body>
     </nb-card>
diff --git a/src/app/pages/nebular/window/window.component.scss b/src/app/pages/nebular/window/window.component.scss
index b8992e89ef..1d4121419a 100644
--- a/src/app/pages/nebular/window/window.component.scss
+++ b/src/app/pages/nebular/window/window.component.scss
@@ -1,7 +1,38 @@
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/breakpoints';
+
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
   button + button {
     margin-left: 2rem;
   }
+
+  @include media-breakpoint-down(xxl) {
+    nb-card-body {
+      display: flex;
+    }
+
+    button {
+      flex: 1;
+      padding: 0.8rem;
+    }
+  }
+
+  @include media-breakpoint-down(is) {
+    nb-card-body {
+      display: block;
+    }
+
+    button {
+      + button {
+        margin-left: 0;
+      }
+
+      width: 100%;
+      display: block;
+      margin-bottom: 2rem;
+      padding: 0.75rem;
+    }
+  }
 }

From 158b2f64ffd15a2d891c9d2bc4db6411a9359432 Mon Sep 17 00:00:00 2001
From: denStrigo <d.strigo@akveo.com>
Date: Thu, 15 Nov 2018 17:16:20 +0300
Subject: [PATCH 09/11] feat(components): update styles for chat, accordion
 nebular components

---
 .../accordion/accordion.component.html        |  4 --
 .../accordion/accordion.component.scss        |  6 ++
 .../chat-message-type.component.html          | 61 ------------------
 .../chat-message-type.component.scss          | 36 -----------
 .../chat-message-type.component.ts            | 10 ---
 .../pages/nebular/chat/chat.component.html    | 62 ++++++++++++-------
 .../pages/nebular/chat/chat.component.scss    | 26 +++++++-
 .../nebular-inputs.component.html             | 23 +++----
 src/app/pages/nebular/nebular.module.ts       |  2 -
 9 files changed, 80 insertions(+), 150 deletions(-)
 delete mode 100644 src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.html
 delete mode 100644 src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.scss
 delete mode 100644 src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.ts

diff --git a/src/app/pages/nebular/accordion/accordion.component.html b/src/app/pages/nebular/accordion/accordion.component.html
index e50ea8fd15..180e3abab8 100644
--- a/src/app/pages/nebular/accordion/accordion.component.html
+++ b/src/app/pages/nebular/accordion/accordion.component.html
@@ -44,10 +44,6 @@
   </div>
 
   <div class="accordion-container col-md-12 col-lg-6 col-xxxl-6">
-    <nb-card>
-      <nb-card-header>Accordion</nb-card-header>
-    </nb-card>
-
     <nb-accordion multi>
       <nb-accordion-item>
         <nb-accordion-item-header>
diff --git a/src/app/pages/nebular/accordion/accordion.component.scss b/src/app/pages/nebular/accordion/accordion.component.scss
index c8d3673954..9edaf6d101 100644
--- a/src/app/pages/nebular/accordion/accordion.component.scss
+++ b/src/app/pages/nebular/accordion/accordion.component.scss
@@ -4,6 +4,12 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
+  .accordion-container {
+    nb-card {
+      margin-bottom: 1rem;
+    }
+  }
+
   @include media-breakpoint-down(md) {
     .accordion-container {
       margin-bottom: 3rem;
diff --git a/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.html b/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.html
deleted file mode 100644
index 71e3381f3c..0000000000
--- a/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<nb-chat title="Message Types" [size]="'xlarge'">
-  <nb-chat-message
-    message="Gif message"
-    type="file"
-    sender="John Doe"
-    [reply]="true"
-    [date]="date"
-    [files]="[ { url: 'http://www.reactiongifs.com/r/wnd1.gif', type: 'image/gif' } ]"
-    avatar="https://i.gifer.com/no.gif">
-  </nb-chat-message>
-  <nb-chat-message
-    message="Image message"
-    type="file"
-    sender="John Doe"
-    [reply]="true"
-    [date]="date"
-    [files]="[ { url: 'https://picsum.photos/320/240/?image=387', type: 'image/jpeg' } ]"
-    avatar="https://i.gifer.com/no.gif">
-  </nb-chat-message>
-  <nb-chat-message
-    message="Map message"
-    type="map"
-    sender="John Doe"
-    [reply]="true"
-    [date]="date"
-    [latitude]="53.914321"
-    [longitude]="27.5998355"
-    avatar="https://i.gifer.com/no.gif">
-  </nb-chat-message>
-  <nb-chat-message
-    message="File message"
-    type="file"
-    sender="John Doe"
-    [reply]="true"
-    [date]="date"
-    [files]="[ { url: 'http://google.com', icon: 'nb-compose' } ]"
-    [avatar]="'https://i.gifer.com/no.gif'">
-  </nb-chat-message>
-  <nb-chat-message
-    message="Quote message"
-    type="quote"
-    sender="John Doe"
-    [reply]="true"
-    quote="Quooted message here"
-    [date]="date"
-    avatar="https://i.gifer.com/no.gif">
-  </nb-chat-message>
-  <nb-chat-message
-    message="Group of files message"
-    type="file"
-    sender="John Doe"
-    [reply]="true"
-    [date]="date"
-    [files]="[
-          { url: 'http://google.com', icon: 'nb-compose' },
-          { url: 'https://picsum.photos/320/240/?image=387', type: 'image/jpeg' },
-          { url: 'http://www.reactiongifs.com/r/wnd1.gif', type: 'image/gif' }
-         ]"
-    avatar="https://i.gifer.com/no.gif">
-  </nb-chat-message>
-</nb-chat>
diff --git a/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.scss b/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.scss
deleted file mode 100644
index 755ab7b642..0000000000
--- a/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@import '../../../../@theme/styles/themes';
-
-@include nb-install-component() {
-  nb-card-body {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    align-items: center;
-  }
-
-  nb-chat {
-    width: 500px;
-    margin: 0 auto;
-  }
-
-  @include media-breakpoint-down(xxl) {
-    nb-chat {
-      width: 600px;
-    }
-  }
-
-  @include media-breakpoint-down(md) {
-    nb-chat {
-      width: 400px;
-    }
-  }
-
-  @include media-breakpoint-down(is) {
-    nb-chat {
-      width: 300px;
-    }
-  }
-}
diff --git a/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.ts b/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.ts
deleted file mode 100644
index 072783a6a2..0000000000
--- a/src/app/pages/nebular/chat/chat-message-type/chat-message-type.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-chat-message-type',
-  templateUrl: 'chat-message-type.component.html',
-  styleUrls: ['chat-message-type.component.scss'],
-})
-export class ChatMessageTypeComponent {
-  date = new Date();
-}
diff --git a/src/app/pages/nebular/chat/chat.component.html b/src/app/pages/nebular/chat/chat.component.html
index 8b9cc93deb..a6baa5e915 100644
--- a/src/app/pages/nebular/chat/chat.component.html
+++ b/src/app/pages/nebular/chat/chat.component.html
@@ -1,23 +1,39 @@
-<div class="row">
-  <div class="chat-container col-md-12 col-lg-12 col-xxxl-6">
-    <nb-chat title="Nebular Conversational UI" size="xlarge" status="success">
-      <nb-chat-message *ngFor="let msg of messages"
-                       [type]="msg.type"
-                       [message]="msg.text"
-                       [reply]="msg.reply"
-                       [sender]="msg.user.name"
-                       [date]="msg.date"
-                       [files]="msg.files"
-                       [quote]="msg.quote"
-                       [latitude]="msg.latitude"
-                       [longitude]="msg.longitude"
-                       [avatar]="msg.user.avatar">
-      </nb-chat-message>
-      <nb-chat-form (send)="sendMessage($event)" [dropFiles]="true">
-      </nb-chat-form>
-    </nb-chat>
-  </div>
-  <div class="chat-container col-md-12 col-lg-12 col-xxxl-6">
-    <ngx-chat-message-type></ngx-chat-message-type>
-  </div>
-</div>
+<nb-card>
+  <nb-card-header>
+    <p class="chart-description">Here's a complete example build in a bot-like app. Type <code>help</code> to be able to receive different message types.
+      Enjoy the conversation and the beautiful UI.</p>
+  </nb-card-header>
+  <nb-card-body>
+    <div class="row">
+      <div class="chat-container col-md-12 col-lg-6 col-xxxl-6">
+        <nb-chat title="Nebular Conversational UI" size="large" status="success">
+          <nb-chat-message *ngFor="let msg of messages"
+                           [type]="msg.type"
+                           [message]="msg.text"
+                           [reply]="msg.reply"
+                           [sender]="msg.user.name"
+                           [date]="msg.date"
+                           [files]="msg.files"
+                           [quote]="msg.quote"
+                           [latitude]="msg.latitude"
+                           [longitude]="msg.longitude"
+                           [avatar]="msg.user.avatar">
+          </nb-chat-message>
+          <nb-chat-form (send)="sendMessage($event)" [dropFiles]="true">
+          </nb-chat-form>
+        </nb-chat>
+      </div>
+      <div class="chat-container col-md-12 col-lg-6 col-xxxl-6">
+        <div class="chart-features">
+          <p>Main features:</p>
+          <ul>
+            <li>different message types support (text, image, file, file group, map, etc)</li>
+            <li>drag &amp; drop for images and files with preview</li>
+            <li>different UI styles</li>
+            <li>custom action buttons (coming soon)</li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/nebular/chat/chat.component.scss b/src/app/pages/nebular/chat/chat.component.scss
index 74204da5d8..659bc2efae 100644
--- a/src/app/pages/nebular/chat/chat.component.scss
+++ b/src/app/pages/nebular/chat/chat.component.scss
@@ -10,17 +10,33 @@
   }
 
   nb-chat {
-    margin: 0 auto;
+    margin: 3rem auto 0;
     width: 500px;
   }
 
   .chat-container {
-    margin-bottom: 3rem;
+    margin-bottom: 2rem;
+    font-size: nb-theme(font-size-xlg);
+
+    li {
+      padding-top: 1rem;
+    }
+  }
+
+  .chart-description {
+    font-size: nb-theme(font-size-xlg);
+    text-align: center;
+    margin: 0 auto;
+    width: 52%;
+  }
+
+  .chart-features {
+    margin-top: 2.75rem;
   }
 
   @include media-breakpoint-down(xxl) {
     nb-chat {
-      width: 600px;
+      width: 400px;
     }
   }
 
@@ -28,6 +44,10 @@
     nb-chat {
       width: 400px;
     }
+
+    .chart-description {
+      width: 90%;
+    }
   }
 
   @include media-breakpoint-down(is) {
diff --git a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
index 2283ec8711..77b665de9d 100644
--- a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
+++ b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
@@ -1,10 +1,11 @@
 <div class="row">
   <div class="col-md-12 col-lg-6 col-xxxl-6">
     <nb-card>
-      <nb-card-header>Input Elements</nb-card-header>
+      <nb-card-header>Input Size</nb-card-header>
       <nb-card-body>
-        <input type="text" nbInput fullWidth fieldSize="small" placeholder="Input">
-        <textarea nbInput fullWidth shape="round" placeholder="Textarea"></textarea>
+        <input type="text" nbInput fullWidth fieldSize="small" placeholder="Small">
+        <input type="text" nbInput fullWidth fieldSize="medium" placeholder="Medium">
+        <input type="text" nbInput fullWidth fieldSize="large" placeholder="Large">
       </nb-card-body>
     </nb-card>
   </div>
@@ -34,22 +35,22 @@
 
   <div class="col-md-12 col-lg-6 col-xxxl-6">
     <nb-card>
-      <nb-card-header>Input Elements</nb-card-header>
+      <nb-card-header>Input Colors</nb-card-header>
       <nb-card-body>
-        <input type="text" nbInput fullWidth fieldSize="small" placeholder="Input">
-        <textarea nbInput fullWidth shape="round" placeholder="Textarea"></textarea>
+        <input type="text" nbInput fullWidth status="info" placeholder="Info">
+        <input type="text" nbInput fullWidth status="success" placeholder="Success">
+        <input type="text" nbInput fullWidth status="warning" placeholder="Warning">
+        <input type="text" nbInput fullWidth status="danger" placeholder="Danger">
       </nb-card-body>
     </nb-card>
   </div>
 
   <div class="col-md-12 col-lg-6 col-xxxl-6">
     <nb-card>
-      <nb-card-header>Input Colors</nb-card-header>
+      <nb-card-header>Input Elements</nb-card-header>
       <nb-card-body>
-        <input type="text" nbInput fullWidth status="info" placeholder="Info">
-        <input type="text" nbInput fullWidth status="success" placeholder="Success">
-        <input type="text" nbInput fullWidth status="warning" placeholder="Warning">
-        <input type="text" nbInput fullWidth status="danger" placeholder="Danger">
+        <input type="text" nbInput fullWidth fieldSize="small" placeholder="Input">
+        <textarea nbInput fullWidth shape="round" placeholder="Textarea"></textarea>
       </nb-card-body>
     </nb-card>
   </div>
diff --git a/src/app/pages/nebular/nebular.module.ts b/src/app/pages/nebular/nebular.module.ts
index cdac743976..52383986ba 100644
--- a/src/app/pages/nebular/nebular.module.ts
+++ b/src/app/pages/nebular/nebular.module.ts
@@ -37,7 +37,6 @@ import { NebularRadioGroupComponent } from './form-inputs/nebular-radio-group/ne
 import { NebularSelectComponent } from './form-inputs/nebular-select/nebular-select.component';
 import { ChatComponent } from './chat/chat.component';
 import { TooltipComponent } from './tooltip/tooltip.component';
-import { ChatMessageTypeComponent } from './chat/chat-message-type/chat-message-type.component';
 
 // services
 import { NewsService } from './services/news.service';
@@ -75,7 +74,6 @@ const COMPONENTS = [
   NebularRadioGroupComponent,
   NebularSelectComponent,
   ChatComponent,
-  ChatMessageTypeComponent,
   TooltipComponent,
 ];
 

From d6d366b03ebc6491863feb16f2f6ee344747d3ae Mon Sep 17 00:00:00 2001
From: denStrigo <d.strigo@akveo.com>
Date: Fri, 16 Nov 2018 19:18:38 +0300
Subject: [PATCH 10/11] feat(components): reorganize components structure,
 replace bootstrap on nebular components where it's possible, add calendar kit
 component, update styles

---
 src/app/@theme/theme.module.ts                |   2 +
 .../components/components-routing.module.ts   |  32 -----
 src/app/pages/components/components.module.ts |  20 ---
 .../notifications/notifications.component.ts  |  78 -----------
 .../accordion/accordion.component.html        |   0
 .../accordion/accordion.component.scss        |   0
 .../accordion/accordion.component.ts          |   0
 .../alert/alert.component.html                |   0
 .../alert/alert.component.ts                  |   0
 .../calendar-kit/calendar-kit.component.html  |  12 ++
 .../calendar-kit/calendar-kit.component.scss  |  13 ++
 .../calendar-kit/calendar-kit.component.ts    |  13 ++
 .../month-cell/month-cell.component.html      |   7 +
 .../month-cell/month-cell.component.scss}     |   4 +-
 .../month-cell/month-cell.component.ts        |  27 ++++
 .../calendar}/calendar.component.html         |   0
 .../calendar}/calendar.component.scss         |   0
 .../calendar}/calendar.component.ts           |   0
 .../day-cell/day-cell.component.html          |   0
 .../day-cell/day-cell.component.scss          |   0
 .../calendar}/day-cell/day-cell.component.ts  |   0
 .../chat/bot-replies.ts                       |   0
 .../chat/chat.component.html                  |   0
 .../chat/chat.component.scss                  |   1 +
 .../chat/chat.component.ts                    |   0
 .../chat/chat.service.ts                      |   0
 .../chat/messages.ts                          |   0
 .../extra-components-routing.module.ts}       |  89 +++++++------
 .../extra-components.component.ts}            |   2 +-
 .../extra-components.module.ts}               | 117 +++++++----------
 .../nebular-form-inputs.component.html        |   3 +
 .../nebular-form-inputs.component.scss        |   0
 .../nebular-form-inputs.component.ts          |   0
 .../nebular-select.component.html             |   0
 .../nebular-select.component.scss             |   0
 .../nebular-select.component.ts               |   0
 .../infinite-list.component.html              |   0
 .../infinite-list.component.scss              |   0
 .../infinite-list/infinite-list.component.ts  |   0
 .../news-post-placeholder.component.html      |   0
 .../news-post-placeholder.component.scss      |   0
 .../news-post-placeholder.component.ts        |   0
 .../news-post/news-post.component.html        |   0
 .../news-post/news-post.component.ts          |   0
 .../list/fruits-list.ts                       |   0
 .../list/list.component.html                  |   0
 .../list/list.component.scss                  |   0
 .../list/list.component.ts                    |   0
 .../interactive-progress-bar.component.html   |   0
 .../interactive-progress-bar.component.scss   |   0
 .../interactive-progress-bar.component.ts     |   0
 .../progress-bar/progress-bar.component.html  |   0
 .../progress-bar/progress-bar.component.scss  |   0
 .../progress-bar/progress-bar.component.ts    |   0
 .../services/news.service.ts                  |   0
 .../spinner-color.component.html              |   0
 .../spinner-color/spinner-color.component.ts  |   0
 .../spinner-in-buttons.component.html         |   0
 .../spinner-in-buttons.component.scss         |   0
 .../spinner-in-buttons.component.ts           |   0
 .../spinner-in-tabs.component.html            |   0
 .../spinner-in-tabs.component.scss            |   0
 .../spinner-in-tabs.component.ts              |   0
 .../spinner-sizes.component.html              |   0
 .../spinner-sizes/spinner-sizes.component.ts  |   0
 .../spinner/spinner.component.html            |   0
 .../spinner/spinner.component.scss            |   0
 .../spinner/spinner.component.ts              |   0
 .../stepper/stepper.component.html            |   0
 .../stepper/stepper.component.scss            |   0
 .../stepper/stepper.component.ts              |   0
 .../tabs/tabs.component.html                  |   0
 .../tabs/tabs.component.scss                  |   0
 .../tabs/tabs.component.ts                    |   4 +-
 .../tree/tree.component.html                  |   0
 .../tree/tree.component.scss                  |   0
 .../tree/tree.component.ts                    |   0
 .../action-groups.component.html              |   0
 .../action-groups.component.scss              |   0
 .../action-groups/action-groups.component.ts  |   0
 .../block-level-buttons.component.html        |   0
 .../block-level-buttons.component.ts          |   0
 .../button-groups.component.html              |   0
 .../button-groups.component.scss              |   0
 .../button-groups/button-groups.component.ts  |   0
 .../buttons/buttons.component.html            |   0
 .../buttons/buttons.component.scss            |   0
 .../buttons/buttons.component.ts              |   0
 .../buttons/buttons.module.ts                 |   0
 .../default-buttons.component.html            |  23 +++-
 .../default-buttons.component.scss            |   0
 .../default-buttons.component.ts              |  28 ++--
 .../dropdown-button.component.html            |   0
 .../dropdown-button.component.scss            |   0
 .../dropdown-button.component.ts              |   0
 .../hero-buttons/hero-buttons.component.html  |   3 +-
 .../hero-buttons/hero-buttons.component.scss  |   0
 .../hero-buttons/hero-buttons.component.ts    |  11 +-
 .../icon-buttons/icon-buttons.component.html  |   0
 .../icon-buttons/icon-buttons.component.scss  |   0
 .../icon-buttons/icon-buttons.component.ts    |   0
 .../labeled-actions-group.component.html      |   0
 .../labeled-actions-group.component.scss      |   0
 .../labeled-actions-group.component.ts        |   0
 .../shape-buttons.component.html              |   6 +-
 .../shape-buttons.component.scss              |   0
 .../shape-buttons/shape-buttons.component.ts  |   0
 .../size-buttons/size-buttons.component.html  |   8 +-
 .../size-buttons/size-buttons.component.scss  |   0
 .../size-buttons/size-buttons.component.ts    |   0
 .../datepicker/datepicker.component.html      |   0
 .../datepicker/datepicker.component.scss      |   0
 .../datepicker/datepicker.component.ts        |   0
 .../form-inputs/form-inputs.component.html    |  87 +++++++------
 .../form-inputs/form-inputs.component.ts      |   1 +
 src/app/pages/forms/forms-routing.module.ts   |  32 ++++-
 src/app/pages/forms/forms.module.ts           |   2 +
 .../dialog-name-prompt.component.html         |   0
 .../dialog-name-prompt.component.scss         |   0
 .../dialog-name-prompt.component.ts           |   0
 .../dialog/dialog.component.html              |   0
 .../dialog/dialog.component.scss              |   0
 .../dialog/dialog.component.ts                |   0
 .../showcase-dialog.component.html            |   0
 .../showcase-dialog.component.scss            |   0
 .../showcase-dialog.component.ts              |   0
 .../modal-overlays-routing.module.ts          |  49 +++++++
 .../modal-overlays.component.ts}              |   4 +-
 .../modal-overlays/modal-overlays.module.ts   |  78 +++++++++++
 .../modals/modal/modal.component.html         |   0
 .../modals/modal/modal.component.ts           |   0
 .../modals/modals.component.html              |   0
 .../modals/modals.component.scss              |   0
 .../modals/modals.component.ts                |   0
 .../popovers/popover-examples.component.ts    |   0
 .../popovers/popovers.component.html          |   0
 .../popovers/popovers.component.scss          |   0
 .../popovers/popovers.component.ts            |   0
 .../toastr/toastr.component.html}             |  34 +----
 .../toastr/toastr.component.scss}             |   0
 .../modal-overlays/toastr/toastr.component.ts |  84 ++++++++++++
 .../tooltip/tooltip.component.html            |   0
 .../tooltip/tooltip.component.scss            |   0
 .../tooltip/tooltip.component.ts              |   0
 .../window-form/window-form.component.scss    |   0
 .../window-form/window-form.component.ts      |   0
 .../window/window.component.html              |   0
 .../window/window.component.scss              |   0
 .../window/window.component.ts                |   0
 .../nebular-checkbox.component.html           |   5 -
 .../nebular-checkbox.component.ts             |  10 --
 .../nebular-form-inputs.component.html        |  21 ---
 .../nebular-inputs.component.html             |  57 --------
 .../nebular-inputs.component.scss             |   7 -
 .../nebular-inputs.component.ts               |  10 --
 .../nebular-radio-group.component.html        |  10 --
 .../nebular-radio-group.component.scss        |  12 --
 .../nebular-radio-group.component.ts          |  16 ---
 .../nebular/toastr/toastr.component.html      |   3 -
 .../nebular/toastr/toastr.component.scss      |   5 -
 .../pages/nebular/toastr/toastr.component.ts  |  10 --
 src/app/pages/pages-menu.ts                   | 123 +++++++++---------
 src/app/pages/pages-routing.module.ts         |  10 +-
 .../ui-features/icons/icons.component.ts      |   2 +-
 .../ui-features/ui-features-routing.module.ts |  29 +----
 .../pages/ui-features/ui-features.module.ts   |  25 ----
 166 files changed, 593 insertions(+), 636 deletions(-)
 delete mode 100644 src/app/pages/components/components-routing.module.ts
 delete mode 100644 src/app/pages/components/components.module.ts
 delete mode 100644 src/app/pages/components/notifications/notifications.component.ts
 rename src/app/pages/{nebular => extra-components}/accordion/accordion.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/accordion/accordion.component.scss (100%)
 rename src/app/pages/{nebular => extra-components}/accordion/accordion.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/alert/alert.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/alert/alert.component.ts (100%)
 create mode 100644 src/app/pages/extra-components/calendar-kit/calendar-kit.component.html
 create mode 100644 src/app/pages/extra-components/calendar-kit/calendar-kit.component.scss
 create mode 100644 src/app/pages/extra-components/calendar-kit/calendar-kit.component.ts
 create mode 100644 src/app/pages/extra-components/calendar-kit/month-cell/month-cell.component.html
 rename src/app/pages/{nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.scss => extra-components/calendar-kit/month-cell/month-cell.component.scss} (66%)
 create mode 100644 src/app/pages/extra-components/calendar-kit/month-cell/month-cell.component.ts
 rename src/app/pages/{nebular/calundar => extra-components/calendar}/calendar.component.html (100%)
 rename src/app/pages/{nebular/calundar => extra-components/calendar}/calendar.component.scss (100%)
 rename src/app/pages/{nebular/calundar => extra-components/calendar}/calendar.component.ts (100%)
 rename src/app/pages/{nebular/calundar => extra-components/calendar}/day-cell/day-cell.component.html (100%)
 rename src/app/pages/{nebular/calundar => extra-components/calendar}/day-cell/day-cell.component.scss (100%)
 rename src/app/pages/{nebular/calundar => extra-components/calendar}/day-cell/day-cell.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/chat/bot-replies.ts (100%)
 rename src/app/pages/{nebular => extra-components}/chat/chat.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/chat/chat.component.scss (99%)
 rename src/app/pages/{nebular => extra-components}/chat/chat.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/chat/chat.service.ts (100%)
 rename src/app/pages/{nebular => extra-components}/chat/messages.ts (100%)
 rename src/app/pages/{nebular/nebular-routing.module.ts => extra-components/extra-components-routing.module.ts} (61%)
 rename src/app/pages/{components/components.component.ts => extra-components/extra-components.component.ts} (78%)
 rename src/app/pages/{nebular/nebular.module.ts => extra-components/extra-components.module.ts} (56%)
 create mode 100644 src/app/pages/extra-components/form-inputs/nebular-form-inputs.component.html
 rename src/app/pages/{nebular => extra-components}/form-inputs/nebular-form-inputs.component.scss (100%)
 rename src/app/pages/{nebular => extra-components}/form-inputs/nebular-form-inputs.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/form-inputs/nebular-select/nebular-select.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/form-inputs/nebular-select/nebular-select.component.scss (100%)
 rename src/app/pages/{nebular => extra-components}/form-inputs/nebular-select/nebular-select.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/infinite-list/infinite-list.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/infinite-list/infinite-list.component.scss (100%)
 rename src/app/pages/{nebular => extra-components}/infinite-list/infinite-list.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/infinite-list/news-post-placeholder/news-post-placeholder.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/infinite-list/news-post-placeholder/news-post-placeholder.component.scss (100%)
 rename src/app/pages/{nebular => extra-components}/infinite-list/news-post-placeholder/news-post-placeholder.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/infinite-list/news-post/news-post.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/infinite-list/news-post/news-post.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/list/fruits-list.ts (100%)
 rename src/app/pages/{nebular => extra-components}/list/list.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/list/list.component.scss (100%)
 rename src/app/pages/{nebular => extra-components}/list/list.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss (100%)
 rename src/app/pages/{nebular => extra-components}/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/progress-bar/progress-bar.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/progress-bar/progress-bar.component.scss (100%)
 rename src/app/pages/{nebular => extra-components}/progress-bar/progress-bar.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/services/news.service.ts (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner-color/spinner-color.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner-color/spinner-color.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner-in-buttons/spinner-in-buttons.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner-in-buttons/spinner-in-buttons.component.scss (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner-in-buttons/spinner-in-buttons.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner-in-tabs/spinner-in-tabs.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner-in-tabs/spinner-in-tabs.component.scss (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner-in-tabs/spinner-in-tabs.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner-sizes/spinner-sizes.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner-sizes/spinner-sizes.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner.component.scss (100%)
 rename src/app/pages/{nebular => extra-components}/spinner/spinner.component.ts (100%)
 rename src/app/pages/{nebular => extra-components}/stepper/stepper.component.html (100%)
 rename src/app/pages/{nebular => extra-components}/stepper/stepper.component.scss (100%)
 rename src/app/pages/{nebular => extra-components}/stepper/stepper.component.ts (100%)
 rename src/app/pages/{ui-features => extra-components}/tabs/tabs.component.html (100%)
 rename src/app/pages/{ui-features => extra-components}/tabs/tabs.component.scss (100%)
 rename src/app/pages/{ui-features => extra-components}/tabs/tabs.component.ts (91%)
 rename src/app/pages/{components => extra-components}/tree/tree.component.html (100%)
 rename src/app/pages/{components => extra-components}/tree/tree.component.scss (100%)
 rename src/app/pages/{components => extra-components}/tree/tree.component.ts (100%)
 rename src/app/pages/{ui-features => forms}/buttons/action-groups/action-groups.component.html (100%)
 rename src/app/pages/{ui-features => forms}/buttons/action-groups/action-groups.component.scss (100%)
 rename src/app/pages/{ui-features => forms}/buttons/action-groups/action-groups.component.ts (100%)
 rename src/app/pages/{ui-features => forms}/buttons/block-level-buttons/block-level-buttons.component.html (100%)
 rename src/app/pages/{ui-features => forms}/buttons/block-level-buttons/block-level-buttons.component.ts (100%)
 rename src/app/pages/{ui-features => forms}/buttons/button-groups/button-groups.component.html (100%)
 rename src/app/pages/{ui-features => forms}/buttons/button-groups/button-groups.component.scss (100%)
 rename src/app/pages/{ui-features => forms}/buttons/button-groups/button-groups.component.ts (100%)
 rename src/app/pages/{ui-features => forms}/buttons/buttons.component.html (100%)
 rename src/app/pages/{ui-features => forms}/buttons/buttons.component.scss (100%)
 rename src/app/pages/{ui-features => forms}/buttons/buttons.component.ts (100%)
 rename src/app/pages/{ui-features => forms}/buttons/buttons.module.ts (100%)
 rename src/app/pages/{ui-features => forms}/buttons/default-buttons/default-buttons.component.html (68%)
 rename src/app/pages/{ui-features => forms}/buttons/default-buttons/default-buttons.component.scss (100%)
 rename src/app/pages/{ui-features => forms}/buttons/default-buttons/default-buttons.component.ts (83%)
 rename src/app/pages/{ui-features => forms}/buttons/dropdown-buttons/dropdown-button.component.html (100%)
 rename src/app/pages/{ui-features => forms}/buttons/dropdown-buttons/dropdown-button.component.scss (100%)
 rename src/app/pages/{ui-features => forms}/buttons/dropdown-buttons/dropdown-button.component.ts (100%)
 rename src/app/pages/{ui-features => forms}/buttons/hero-buttons/hero-buttons.component.html (93%)
 rename src/app/pages/{ui-features => forms}/buttons/hero-buttons/hero-buttons.component.scss (100%)
 rename src/app/pages/{ui-features => forms}/buttons/hero-buttons/hero-buttons.component.ts (96%)
 rename src/app/pages/{ui-features => forms}/buttons/icon-buttons/icon-buttons.component.html (100%)
 rename src/app/pages/{ui-features => forms}/buttons/icon-buttons/icon-buttons.component.scss (100%)
 rename src/app/pages/{ui-features => forms}/buttons/icon-buttons/icon-buttons.component.ts (100%)
 rename src/app/pages/{ui-features => forms}/buttons/labeled-actions-group/labeled-actions-group.component.html (100%)
 rename src/app/pages/{ui-features => forms}/buttons/labeled-actions-group/labeled-actions-group.component.scss (100%)
 rename src/app/pages/{ui-features => forms}/buttons/labeled-actions-group/labeled-actions-group.component.ts (100%)
 rename src/app/pages/{ui-features => forms}/buttons/shape-buttons/shape-buttons.component.html (75%)
 rename src/app/pages/{ui-features => forms}/buttons/shape-buttons/shape-buttons.component.scss (100%)
 rename src/app/pages/{ui-features => forms}/buttons/shape-buttons/shape-buttons.component.ts (100%)
 rename src/app/pages/{ui-features => forms}/buttons/size-buttons/size-buttons.component.html (78%)
 rename src/app/pages/{ui-features => forms}/buttons/size-buttons/size-buttons.component.scss (100%)
 rename src/app/pages/{ui-features => forms}/buttons/size-buttons/size-buttons.component.ts (100%)
 rename src/app/pages/{nebular => forms}/datepicker/datepicker.component.html (100%)
 rename src/app/pages/{nebular => forms}/datepicker/datepicker.component.scss (100%)
 rename src/app/pages/{nebular => forms}/datepicker/datepicker.component.ts (100%)
 rename src/app/pages/{nebular => modal-overlays}/dialog/dialog-name-prompt/dialog-name-prompt.component.html (100%)
 rename src/app/pages/{nebular => modal-overlays}/dialog/dialog-name-prompt/dialog-name-prompt.component.scss (100%)
 rename src/app/pages/{nebular => modal-overlays}/dialog/dialog-name-prompt/dialog-name-prompt.component.ts (100%)
 rename src/app/pages/{nebular => modal-overlays}/dialog/dialog.component.html (100%)
 rename src/app/pages/{nebular => modal-overlays}/dialog/dialog.component.scss (100%)
 rename src/app/pages/{nebular => modal-overlays}/dialog/dialog.component.ts (100%)
 rename src/app/pages/{nebular => modal-overlays}/dialog/showcase-dialog/showcase-dialog.component.html (100%)
 rename src/app/pages/{nebular => modal-overlays}/dialog/showcase-dialog/showcase-dialog.component.scss (100%)
 rename src/app/pages/{nebular => modal-overlays}/dialog/showcase-dialog/showcase-dialog.component.ts (100%)
 create mode 100644 src/app/pages/modal-overlays/modal-overlays-routing.module.ts
 rename src/app/pages/{nebular/nebular.component.ts => modal-overlays/modal-overlays.component.ts} (62%)
 create mode 100644 src/app/pages/modal-overlays/modal-overlays.module.ts
 rename src/app/pages/{ui-features => modal-overlays}/modals/modal/modal.component.html (100%)
 rename src/app/pages/{ui-features => modal-overlays}/modals/modal/modal.component.ts (100%)
 rename src/app/pages/{ui-features => modal-overlays}/modals/modals.component.html (100%)
 rename src/app/pages/{ui-features => modal-overlays}/modals/modals.component.scss (100%)
 rename src/app/pages/{ui-features => modal-overlays}/modals/modals.component.ts (100%)
 rename src/app/pages/{ui-features => modal-overlays}/popovers/popover-examples.component.ts (100%)
 rename src/app/pages/{ui-features => modal-overlays}/popovers/popovers.component.html (100%)
 rename src/app/pages/{ui-features => modal-overlays}/popovers/popovers.component.scss (100%)
 rename src/app/pages/{ui-features => modal-overlays}/popovers/popovers.component.ts (100%)
 rename src/app/pages/{components/notifications/notifications.component.html => modal-overlays/toastr/toastr.component.html} (59%)
 rename src/app/pages/{components/notifications/notifications.component.scss => modal-overlays/toastr/toastr.component.scss} (100%)
 create mode 100644 src/app/pages/modal-overlays/toastr/toastr.component.ts
 rename src/app/pages/{nebular => modal-overlays}/tooltip/tooltip.component.html (100%)
 rename src/app/pages/{nebular => modal-overlays}/tooltip/tooltip.component.scss (100%)
 rename src/app/pages/{nebular => modal-overlays}/tooltip/tooltip.component.ts (100%)
 rename src/app/pages/{nebular => modal-overlays}/window/window-form/window-form.component.scss (100%)
 rename src/app/pages/{nebular => modal-overlays}/window/window-form/window-form.component.ts (100%)
 rename src/app/pages/{nebular => modal-overlays}/window/window.component.html (100%)
 rename src/app/pages/{nebular => modal-overlays}/window/window.component.scss (100%)
 rename src/app/pages/{nebular => modal-overlays}/window/window.component.ts (100%)
 delete mode 100644 src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.html
 delete mode 100644 src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.ts
 delete mode 100644 src/app/pages/nebular/form-inputs/nebular-form-inputs.component.html
 delete mode 100644 src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
 delete mode 100644 src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.scss
 delete mode 100644 src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.ts
 delete mode 100644 src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.html
 delete mode 100644 src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.scss
 delete mode 100644 src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.ts
 delete mode 100644 src/app/pages/nebular/toastr/toastr.component.html
 delete mode 100644 src/app/pages/nebular/toastr/toastr.component.scss
 delete mode 100644 src/app/pages/nebular/toastr/toastr.component.ts

diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts
index 7b9a3eb76b..2da490ef32 100644
--- a/src/app/@theme/theme.module.ts
+++ b/src/app/@theme/theme.module.ts
@@ -35,6 +35,7 @@ import {
   NbSelectModule,
   NbChatModule,
   NbTooltipModule,
+  NbCalendarKitModule,
 } from '@nebular/theme';
 
 import { NbSecurityModule } from '@nebular/security';
@@ -102,6 +103,7 @@ const NB_MODULES = [
   NbSelectModule,
   NbChatModule,
   NbTooltipModule,
+  NbCalendarKitModule,
 ];
 
 const COMPONENTS = [
diff --git a/src/app/pages/components/components-routing.module.ts b/src/app/pages/components/components-routing.module.ts
deleted file mode 100644
index 655666d897..0000000000
--- a/src/app/pages/components/components-routing.module.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { ComponentsComponent } from './components.component';
-import { TreeComponent } from './tree/tree.component';
-import { NotificationsComponent } from './notifications/notifications.component';
-
-const routes: Routes = [{
-  path: '',
-  component: ComponentsComponent,
-  children: [
-  {
-    path: 'tree',
-    component: TreeComponent,
-  }, {
-    path: 'notifications',
-    component: NotificationsComponent,
-  },
-  ],
-}];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class ComponentsRoutingModule { }
-
-export const routedComponents = [
-  ComponentsComponent,
-  TreeComponent,
-  NotificationsComponent,
-];
diff --git a/src/app/pages/components/components.module.ts b/src/app/pages/components/components.module.ts
deleted file mode 100644
index ea38db9e9c..0000000000
--- a/src/app/pages/components/components.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { TreeModule } from 'angular-tree-component';
-import { ToasterModule } from 'angular2-toaster';
-
-import { ThemeModule } from '../../@theme/theme.module';
-import { ComponentsRoutingModule, routedComponents } from './components-routing.module';
-
-@NgModule({
-  imports: [
-    ThemeModule,
-    ComponentsRoutingModule,
-    TreeModule,
-    ToasterModule.forRoot(),
-  ],
-  declarations: [
-    ...routedComponents,
-  ],
-})
-export class ComponentsModule { }
diff --git a/src/app/pages/components/notifications/notifications.component.ts b/src/app/pages/components/notifications/notifications.component.ts
deleted file mode 100644
index 7df98b9739..0000000000
--- a/src/app/pages/components/notifications/notifications.component.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Component } from '@angular/core';
-import { ToasterService, ToasterConfig, Toast, BodyOutputType } from 'angular2-toaster';
-
-import 'style-loader!angular2-toaster/toaster.css';
-
-@Component({
-  selector: 'ngx-notifications',
-  styleUrls: ['./notifications.component.scss'],
-  templateUrl: './notifications.component.html',
-})
-export class NotificationsComponent {
-  constructor(private toasterService: ToasterService) {}
-
-  config: ToasterConfig;
-
-  position = 'toast-top-right';
-  animationType = 'fade';
-  title = 'HI there!';
-  content = `I'm cool toaster!`;
-  timeout = 5000;
-  toastsLimit = 5;
-  type = 'default';
-
-  isNewestOnTop = true;
-  isHideOnClick = true;
-  isDuplicatesPrevented = false;
-  isCloseButton = true;
-
-  types: string[] = ['default', 'info', 'success', 'warning', 'error'];
-  animations: string[] = ['fade', 'flyLeft', 'flyRight', 'slideDown', 'slideUp'];
-  positions: string[] = ['toast-top-full-width', 'toast-bottom-full-width', 'toast-top-left', 'toast-top-center',
-    'toast-top-right', 'toast-bottom-right', 'toast-bottom-center', 'toast-bottom-left', 'toast-center'];
-
-  quotes = [
-    { title: null, body: 'We rock at <i>Angular</i>' },
-    { title: null, body: 'Titles are not always needed' },
-    { title: null, body: 'Toastr rock!' },
-    { title: 'What about nice html?', body: '<b>Sure you <em>can!</em></b>' },
-  ];
-
-  makeToast() {
-    this.showToast(this.type, this.title, this.content);
-  }
-
-  openRandomToast () {
-    const typeIndex = Math.floor(Math.random() * this.types.length);
-    const quoteIndex = Math.floor(Math.random() * this.quotes.length);
-    const type = this.types[typeIndex];
-    const quote = this.quotes[quoteIndex];
-
-    this.showToast(type, quote.title, quote.body);
-  }
-
-  private showToast(type: string, title: string, body: string) {
-    this.config = new ToasterConfig({
-      positionClass: this.position,
-      timeout: this.timeout,
-      newestOnTop: this.isNewestOnTop,
-      tapToDismiss: this.isHideOnClick,
-      preventDuplicates: this.isDuplicatesPrevented,
-      animation: this.animationType,
-      limit: this.toastsLimit,
-    });
-    const toast: Toast = {
-      type: type,
-      title: title,
-      body: body,
-      timeout: this.timeout,
-      showCloseButton: this.isCloseButton,
-      bodyOutputType: BodyOutputType.TrustedHtml,
-    };
-    this.toasterService.popAsync(toast);
-  }
-
-  clearToasts() {
-    this.toasterService.clear();
-  }
-}
diff --git a/src/app/pages/nebular/accordion/accordion.component.html b/src/app/pages/extra-components/accordion/accordion.component.html
similarity index 100%
rename from src/app/pages/nebular/accordion/accordion.component.html
rename to src/app/pages/extra-components/accordion/accordion.component.html
diff --git a/src/app/pages/nebular/accordion/accordion.component.scss b/src/app/pages/extra-components/accordion/accordion.component.scss
similarity index 100%
rename from src/app/pages/nebular/accordion/accordion.component.scss
rename to src/app/pages/extra-components/accordion/accordion.component.scss
diff --git a/src/app/pages/nebular/accordion/accordion.component.ts b/src/app/pages/extra-components/accordion/accordion.component.ts
similarity index 100%
rename from src/app/pages/nebular/accordion/accordion.component.ts
rename to src/app/pages/extra-components/accordion/accordion.component.ts
diff --git a/src/app/pages/nebular/alert/alert.component.html b/src/app/pages/extra-components/alert/alert.component.html
similarity index 100%
rename from src/app/pages/nebular/alert/alert.component.html
rename to src/app/pages/extra-components/alert/alert.component.html
diff --git a/src/app/pages/nebular/alert/alert.component.ts b/src/app/pages/extra-components/alert/alert.component.ts
similarity index 100%
rename from src/app/pages/nebular/alert/alert.component.ts
rename to src/app/pages/extra-components/alert/alert.component.ts
diff --git a/src/app/pages/extra-components/calendar-kit/calendar-kit.component.html b/src/app/pages/extra-components/calendar-kit/calendar-kit.component.html
new file mode 100644
index 0000000000..2e0cb17c58
--- /dev/null
+++ b/src/app/pages/extra-components/calendar-kit/calendar-kit.component.html
@@ -0,0 +1,12 @@
+<nb-card>
+  <nb-card-header>
+    <p><code>NbCalendarKitModule</code> is a module that contains multiple useful components for building custom calendars.
+      So if you think our calendars is not enough powerful for you just use calendar-kit and build your own calendar!</p>
+  </nb-card-header>
+  <nb-card-body>
+    <nb-calendar-month-picker
+      [(month)]="month"
+      [cellComponent]="monthCellComponent"
+    ></nb-calendar-month-picker>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/extra-components/calendar-kit/calendar-kit.component.scss b/src/app/pages/extra-components/calendar-kit/calendar-kit.component.scss
new file mode 100644
index 0000000000..beb36ccb39
--- /dev/null
+++ b/src/app/pages/extra-components/calendar-kit/calendar-kit.component.scss
@@ -0,0 +1,13 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  nb-card-header {
+    display: flex;
+    justify-content: center;
+    text-align: center;
+
+    p {
+      width: 80%;
+    }
+  }
+}
diff --git a/src/app/pages/extra-components/calendar-kit/calendar-kit.component.ts b/src/app/pages/extra-components/calendar-kit/calendar-kit.component.ts
new file mode 100644
index 0000000000..acfb9c265d
--- /dev/null
+++ b/src/app/pages/extra-components/calendar-kit/calendar-kit.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { CalendarKitMonthCellComponent } from './month-cell/month-cell.component';
+
+@Component({
+  selector: 'ngx-calendar-kit',
+  templateUrl: 'calendar-kit.component.html',
+  styleUrls: ['calendar-kit.component.scss'],
+  entryComponents: [CalendarKitMonthCellComponent],
+})
+export class CalendarKitFullCalendarShowcaseComponent {
+  month = new Date();
+  monthCellComponent = CalendarKitMonthCellComponent;
+}
diff --git a/src/app/pages/extra-components/calendar-kit/month-cell/month-cell.component.html b/src/app/pages/extra-components/calendar-kit/month-cell/month-cell.component.html
new file mode 100644
index 0000000000..1545e6db0e
--- /dev/null
+++ b/src/app/pages/extra-components/calendar-kit/month-cell/month-cell.component.html
@@ -0,0 +1,7 @@
+<h4>{{ title }}</h4>
+<nb-calendar-day-picker
+  [boundingMonths]="false"
+  [visibleDate]="date"
+  [date]="selectedValue"
+  (dateChange)="select.emit($event)">
+</nb-calendar-day-picker>
diff --git a/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.scss b/src/app/pages/extra-components/calendar-kit/month-cell/month-cell.component.scss
similarity index 66%
rename from src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.scss
rename to src/app/pages/extra-components/calendar-kit/month-cell/month-cell.component.scss
index 7cc095a554..21a02e7ff8 100644
--- a/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.scss
+++ b/src/app/pages/extra-components/calendar-kit/month-cell/month-cell.component.scss
@@ -1,7 +1,5 @@
 @import '../../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  nb-checkbox {
-    display: block;
-  }
+  padding: 1rem;
 }
diff --git a/src/app/pages/extra-components/calendar-kit/month-cell/month-cell.component.ts b/src/app/pages/extra-components/calendar-kit/month-cell/month-cell.component.ts
new file mode 100644
index 0000000000..b0f3c22549
--- /dev/null
+++ b/src/app/pages/extra-components/calendar-kit/month-cell/month-cell.component.ts
@@ -0,0 +1,27 @@
+import { Component, EventEmitter } from '@angular/core';
+import {
+  NbCalendarCell,
+  NbCalendarDayPickerComponent,
+  NbCalendarMonthModelService,
+  NbDateService,
+} from '@nebular/theme';
+import { TranslationWidth } from '@angular/common';
+
+@Component({
+  selector: 'ngx-calendar-kit-month-cell',
+  styleUrls: ['month-cell.component.scss'],
+  templateUrl: 'month-cell.component.html',
+})
+export class CalendarKitMonthCellComponent extends NbCalendarDayPickerComponent<Date, Date>
+  implements NbCalendarCell<Date, Date> {
+  select: EventEmitter<Date> = new EventEmitter();
+  selectedValue: Date;
+
+  constructor(private dateService: NbDateService<Date>, monthModel: NbCalendarMonthModelService<Date>) {
+    super(monthModel);
+  }
+
+  get title() {
+    return this.dateService.getMonthName(this.date, TranslationWidth.Wide);
+  }
+}
diff --git a/src/app/pages/nebular/calundar/calendar.component.html b/src/app/pages/extra-components/calendar/calendar.component.html
similarity index 100%
rename from src/app/pages/nebular/calundar/calendar.component.html
rename to src/app/pages/extra-components/calendar/calendar.component.html
diff --git a/src/app/pages/nebular/calundar/calendar.component.scss b/src/app/pages/extra-components/calendar/calendar.component.scss
similarity index 100%
rename from src/app/pages/nebular/calundar/calendar.component.scss
rename to src/app/pages/extra-components/calendar/calendar.component.scss
diff --git a/src/app/pages/nebular/calundar/calendar.component.ts b/src/app/pages/extra-components/calendar/calendar.component.ts
similarity index 100%
rename from src/app/pages/nebular/calundar/calendar.component.ts
rename to src/app/pages/extra-components/calendar/calendar.component.ts
diff --git a/src/app/pages/nebular/calundar/day-cell/day-cell.component.html b/src/app/pages/extra-components/calendar/day-cell/day-cell.component.html
similarity index 100%
rename from src/app/pages/nebular/calundar/day-cell/day-cell.component.html
rename to src/app/pages/extra-components/calendar/day-cell/day-cell.component.html
diff --git a/src/app/pages/nebular/calundar/day-cell/day-cell.component.scss b/src/app/pages/extra-components/calendar/day-cell/day-cell.component.scss
similarity index 100%
rename from src/app/pages/nebular/calundar/day-cell/day-cell.component.scss
rename to src/app/pages/extra-components/calendar/day-cell/day-cell.component.scss
diff --git a/src/app/pages/nebular/calundar/day-cell/day-cell.component.ts b/src/app/pages/extra-components/calendar/day-cell/day-cell.component.ts
similarity index 100%
rename from src/app/pages/nebular/calundar/day-cell/day-cell.component.ts
rename to src/app/pages/extra-components/calendar/day-cell/day-cell.component.ts
diff --git a/src/app/pages/nebular/chat/bot-replies.ts b/src/app/pages/extra-components/chat/bot-replies.ts
similarity index 100%
rename from src/app/pages/nebular/chat/bot-replies.ts
rename to src/app/pages/extra-components/chat/bot-replies.ts
diff --git a/src/app/pages/nebular/chat/chat.component.html b/src/app/pages/extra-components/chat/chat.component.html
similarity index 100%
rename from src/app/pages/nebular/chat/chat.component.html
rename to src/app/pages/extra-components/chat/chat.component.html
diff --git a/src/app/pages/nebular/chat/chat.component.scss b/src/app/pages/extra-components/chat/chat.component.scss
similarity index 99%
rename from src/app/pages/nebular/chat/chat.component.scss
rename to src/app/pages/extra-components/chat/chat.component.scss
index 659bc2efae..fff346858c 100644
--- a/src/app/pages/nebular/chat/chat.component.scss
+++ b/src/app/pages/extra-components/chat/chat.component.scss
@@ -12,6 +12,7 @@
   nb-chat {
     margin: 3rem auto 0;
     width: 500px;
+
   }
 
   .chat-container {
diff --git a/src/app/pages/nebular/chat/chat.component.ts b/src/app/pages/extra-components/chat/chat.component.ts
similarity index 100%
rename from src/app/pages/nebular/chat/chat.component.ts
rename to src/app/pages/extra-components/chat/chat.component.ts
diff --git a/src/app/pages/nebular/chat/chat.service.ts b/src/app/pages/extra-components/chat/chat.service.ts
similarity index 100%
rename from src/app/pages/nebular/chat/chat.service.ts
rename to src/app/pages/extra-components/chat/chat.service.ts
diff --git a/src/app/pages/nebular/chat/messages.ts b/src/app/pages/extra-components/chat/messages.ts
similarity index 100%
rename from src/app/pages/nebular/chat/messages.ts
rename to src/app/pages/extra-components/chat/messages.ts
diff --git a/src/app/pages/nebular/nebular-routing.module.ts b/src/app/pages/extra-components/extra-components-routing.module.ts
similarity index 61%
rename from src/app/pages/nebular/nebular-routing.module.ts
rename to src/app/pages/extra-components/extra-components-routing.module.ts
index 3c3749d32b..afefc4f6eb 100644
--- a/src/app/pages/nebular/nebular-routing.module.ts
+++ b/src/app/pages/extra-components/extra-components-routing.module.ts
@@ -1,51 +1,33 @@
 import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { Routes, RouterModule } from '@angular/router';
 
-import { NebularComponent } from './nebular.component';
-import { CalendarComponent } from './calundar/calendar.component';
-import { StepperComponent } from './stepper/stepper.component';
-import { AccordionComponent } from './accordion/accordion.component';
-import { DatepickerComponent } from './datepicker/datepicker.component';
-import { DialogComponent } from './dialog/dialog.component';
-import { WindowComponent } from './window/window.component';
-import { ListComponent } from './list/list.component';
-import { InfiniteListComponent } from './infinite-list/infinite-list.component';
-import { ToastrComponent } from './toastr/toastr.component';
+import { ExtraComponentsComponent } from './extra-components.component';
+import { TreeComponent } from './tree/tree.component';
 import { AlertComponent } from './alert/alert.component';
 import { ProgressBarComponent } from './progress-bar/progress-bar.component';
 import { SpinnerComponent } from './spinner/spinner.component';
-import { NebularFormInputsComponent } from './form-inputs/nebular-form-inputs.component';
+import { CalendarComponent } from './calendar/calendar.component';
 import { ChatComponent } from './chat/chat.component';
-import { TooltipComponent } from './tooltip/tooltip.component';
+import { Tab1Component, Tab2Component, TabsComponent } from './tabs/tabs.component';
+import { AccordionComponent } from './accordion/accordion.component';
+import { NebularFormInputsComponent } from './form-inputs/nebular-form-inputs.component';
+import { InfiniteListComponent } from './infinite-list/infinite-list.component';
+import { ListComponent } from './list/list.component';
+import { StepperComponent } from './stepper/stepper.component';
+import { CalendarKitFullCalendarShowcaseComponent } from './calendar-kit/calendar-kit.component';
 
 const routes: Routes = [{
   path: '',
-  component: NebularComponent,
+  component: ExtraComponentsComponent,
   children: [
     {
       path: 'calendar',
       component: CalendarComponent,
     },
-    {
-      path: 'datepicker',
-      component: DatepickerComponent,
-    },
     {
       path: 'stepper',
       component: StepperComponent,
     },
-    {
-      path: 'accordion',
-      component: AccordionComponent,
-    },
-    {
-      path: 'dialog',
-      component: DialogComponent,
-    },
-    {
-      path: 'window',
-      component: WindowComponent,
-    },
     {
       path: 'list',
       component: ListComponent,
@@ -55,16 +37,12 @@ const routes: Routes = [{
       component: InfiniteListComponent,
     },
     {
-      path: 'toastr',
-      component: ToastrComponent,
-    },
-    {
-      path: 'tooltip',
-      component: TooltipComponent,
+      path: 'form-inputs',
+      component: NebularFormInputsComponent,
     },
     {
-      path: 'alert',
-      component: AlertComponent,
+      path: 'accordion',
+      component: AccordionComponent,
     },
     {
       path: 'progress-bar',
@@ -75,8 +53,35 @@ const routes: Routes = [{
       component: SpinnerComponent,
     },
     {
-      path: 'form-inputs',
-      component: NebularFormInputsComponent,
+      path: 'alert',
+      component: AlertComponent,
+    },
+    {
+      path: 'tree',
+      component: TreeComponent,
+    },
+    {
+      path: 'tabs',
+      component: TabsComponent,
+      children: [
+        {
+          path: '',
+          redirectTo: 'tab1',
+          pathMatch: 'full',
+        },
+        {
+          path: 'tab1',
+          component: Tab1Component,
+        },
+        {
+          path: 'tab2',
+          component: Tab2Component,
+        },
+      ],
+    },
+    {
+      path: 'calendar-kit',
+      component: CalendarKitFullCalendarShowcaseComponent,
     },
     {
       path: 'chat',
@@ -89,7 +94,5 @@ const routes: Routes = [{
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule],
 })
-export class NebularRoutingModule {
+export class ExtraComponentsRoutingModule {
 }
-
-
diff --git a/src/app/pages/components/components.component.ts b/src/app/pages/extra-components/extra-components.component.ts
similarity index 78%
rename from src/app/pages/components/components.component.ts
rename to src/app/pages/extra-components/extra-components.component.ts
index 061d994f70..f132ff8356 100644
--- a/src/app/pages/components/components.component.ts
+++ b/src/app/pages/extra-components/extra-components.component.ts
@@ -6,5 +6,5 @@ import { Component } from '@angular/core';
     <router-outlet></router-outlet>
   `,
 })
-export class ComponentsComponent {
+export class ExtraComponentsComponent {
 }
diff --git a/src/app/pages/nebular/nebular.module.ts b/src/app/pages/extra-components/extra-components.module.ts
similarity index 56%
rename from src/app/pages/nebular/nebular.module.ts
rename to src/app/pages/extra-components/extra-components.module.ts
index 52383986ba..dc1b10d5be 100644
--- a/src/app/pages/nebular/nebular.module.ts
+++ b/src/app/pages/extra-components/extra-components.module.ts
@@ -1,65 +1,45 @@
 import { NgModule } from '@angular/core';
 
-// modules
+import { TreeModule } from 'angular-tree-component';
+import { ToasterModule } from 'angular2-toaster';
+
 import { ThemeModule } from '../../@theme/theme.module';
-import { NebularRoutingModule } from './nebular-routing.module';
+import { ExtraComponentsRoutingModule } from './extra-components-routing.module';
 
 // components
-import { NebularComponent } from './nebular.component';
-import { CalendarComponent } from './calundar/calendar.component';
-import { DayCellComponent } from './calundar/day-cell/day-cell.component';
-import { StepperComponent } from './stepper/stepper.component';
-import { AccordionComponent } from './accordion/accordion.component';
-import { DatepickerComponent } from './datepicker/datepicker.component';
-import { DialogComponent } from './dialog/dialog.component';
-import { ShowcaseDialogComponent } from './dialog/showcase-dialog/showcase-dialog.component';
-import { NbDialogModule, NbWindowModule } from '@nebular/theme';
-import { DialogNamePromptComponent } from './dialog/dialog-name-prompt/dialog-name-prompt.component';
-import { WindowComponent } from './window/window.component';
-import { WindowFormComponent } from './window/window-form/window-form.component';
-import { ListComponent } from './list/list.component';
-import { InfiniteListComponent } from './infinite-list/infinite-list.component';
-import { ToastrComponent } from './toastr/toastr.component';
-import { AlertComponent } from './alert/alert.component';
-import { ProgressBarComponent } from './progress-bar/progress-bar.component';
+import { ExtraComponentsComponent } from './extra-components.component';
+import { TreeComponent } from './tree/tree.component';
+import { SpinnerInTabsComponent } from './spinner/spinner-in-tabs/spinner-in-tabs.component';
+import { SpinnerInButtonsComponent } from './spinner/spinner-in-buttons/spinner-in-buttons.component';
+import { SpinnerSizesComponent } from './spinner/spinner-sizes/spinner-sizes.component';
+import { SpinnerColorComponent } from './spinner/spinner-color/spinner-color.component';
+import { SpinnerComponent } from './spinner/spinner.component';
 import {
   InteractiveProgressBarComponent,
 } from './progress-bar/interactive-progress-bar/interactive-progress-bar.component';
-import { SpinnerComponent } from './spinner/spinner.component';
-import { SpinnerColorComponent } from './spinner/spinner-color/spinner-color.component';
-import { SpinnerSizesComponent } from './spinner/spinner-sizes/spinner-sizes.component';
-import { SpinnerInButtonsComponent } from './spinner/spinner-in-buttons/spinner-in-buttons.component';
-import { SpinnerInTabsComponent } from './spinner/spinner-in-tabs/spinner-in-tabs.component';
+import { ProgressBarComponent } from './progress-bar/progress-bar.component';
+import { AlertComponent } from './alert/alert.component';
+import { ChatComponent } from './chat/chat.component';
+import { Tab1Component, Tab2Component, TabsComponent } from './tabs/tabs.component';
+import { CalendarComponent } from './calendar/calendar.component';
+import { DayCellComponent } from './calendar/day-cell/day-cell.component';
+import { StepperComponent } from './stepper/stepper.component';
+import { ListComponent } from './list/list.component';
+import { InfiniteListComponent } from './infinite-list/infinite-list.component';
+import { NewsPostComponent } from './infinite-list/news-post/news-post.component';
+import { NewsPostPlaceholderComponent } from './infinite-list/news-post-placeholder/news-post-placeholder.component';
+import { AccordionComponent } from './accordion/accordion.component';
 import { NebularFormInputsComponent } from './form-inputs/nebular-form-inputs.component';
-import { NebularInputsComponent } from './form-inputs/nebular-inputs/nebular-inputs.component';
-import { NebularCheckboxComponent } from './form-inputs/nebular-checkbox/nebular-checkbox.component';
-import { NebularRadioGroupComponent } from './form-inputs/nebular-radio-group/nebular-radio-group.component';
 import { NebularSelectComponent } from './form-inputs/nebular-select/nebular-select.component';
-import { ChatComponent } from './chat/chat.component';
-import { TooltipComponent } from './tooltip/tooltip.component';
+import { CalendarKitFullCalendarShowcaseComponent } from './calendar-kit/calendar-kit.component';
+import { CalendarKitMonthCellComponent } from './calendar-kit/month-cell/month-cell.component';
 
-// services
+// service
 import { NewsService } from './services/news.service';
-import { NewsPostComponent } from './infinite-list/news-post/news-post.component';
-import { NewsPostPlaceholderComponent } from './infinite-list/news-post-placeholder/news-post-placeholder.component';
 
 const COMPONENTS = [
-  NebularComponent,
-  CalendarComponent,
-  DayCellComponent,
-  StepperComponent,
-  ListComponent,
-  InfiniteListComponent,
-  NewsPostComponent,
-  NewsPostPlaceholderComponent,
-  ToastrComponent,
-  AccordionComponent,
-  DatepickerComponent,
-  DialogComponent,
-  ShowcaseDialogComponent,
-  DialogNamePromptComponent,
-  WindowComponent,
-  WindowFormComponent,
+  ExtraComponentsComponent,
+  TreeComponent,
   AlertComponent,
   ProgressBarComponent,
   InteractiveProgressBarComponent,
@@ -68,30 +48,33 @@ const COMPONENTS = [
   SpinnerSizesComponent,
   SpinnerInButtonsComponent,
   SpinnerInTabsComponent,
+  CalendarComponent,
+  DayCellComponent,
+  ChatComponent,
+  TabsComponent,
+  Tab1Component,
+  Tab2Component,
+  StepperComponent,
+  ListComponent,
+  InfiniteListComponent,
+  NewsPostComponent,
+  NewsPostPlaceholderComponent,
+  AccordionComponent,
   NebularFormInputsComponent,
-  NebularInputsComponent,
-  NebularCheckboxComponent,
-  NebularRadioGroupComponent,
   NebularSelectComponent,
-  ChatComponent,
-  TooltipComponent,
+  CalendarKitFullCalendarShowcaseComponent,
+  CalendarKitMonthCellComponent,
 ];
 
-const ENTRY_COMPONENTS = [
-  ShowcaseDialogComponent,
-  DialogNamePromptComponent,
-  WindowFormComponent,
+const SERVICES = [
+  NewsService,
 ];
 
 const MODULES = [
   ThemeModule,
-  NebularRoutingModule,
-  NbDialogModule.forChild(),
-  NbWindowModule.forChild(),
-];
-
-const SERVICES = [
-  NewsService,
+  ExtraComponentsRoutingModule,
+  TreeModule,
+  ToasterModule.forRoot(),
 ];
 
 @NgModule({
@@ -104,9 +87,5 @@ const SERVICES = [
   providers: [
     ...SERVICES,
   ],
-  entryComponents: [
-    ...ENTRY_COMPONENTS,
-  ],
 })
-export class NebularModule {
-}
+export class ExtraComponentsModule { }
diff --git a/src/app/pages/extra-components/form-inputs/nebular-form-inputs.component.html b/src/app/pages/extra-components/form-inputs/nebular-form-inputs.component.html
new file mode 100644
index 0000000000..601251c116
--- /dev/null
+++ b/src/app/pages/extra-components/form-inputs/nebular-form-inputs.component.html
@@ -0,0 +1,3 @@
+<div class="row">
+    <ngx-nebular-select></ngx-nebular-select>
+</div>
diff --git a/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.scss b/src/app/pages/extra-components/form-inputs/nebular-form-inputs.component.scss
similarity index 100%
rename from src/app/pages/nebular/form-inputs/nebular-form-inputs.component.scss
rename to src/app/pages/extra-components/form-inputs/nebular-form-inputs.component.scss
diff --git a/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.ts b/src/app/pages/extra-components/form-inputs/nebular-form-inputs.component.ts
similarity index 100%
rename from src/app/pages/nebular/form-inputs/nebular-form-inputs.component.ts
rename to src/app/pages/extra-components/form-inputs/nebular-form-inputs.component.ts
diff --git a/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.html b/src/app/pages/extra-components/form-inputs/nebular-select/nebular-select.component.html
similarity index 100%
rename from src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.html
rename to src/app/pages/extra-components/form-inputs/nebular-select/nebular-select.component.html
diff --git a/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.scss b/src/app/pages/extra-components/form-inputs/nebular-select/nebular-select.component.scss
similarity index 100%
rename from src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.scss
rename to src/app/pages/extra-components/form-inputs/nebular-select/nebular-select.component.scss
diff --git a/src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.ts b/src/app/pages/extra-components/form-inputs/nebular-select/nebular-select.component.ts
similarity index 100%
rename from src/app/pages/nebular/form-inputs/nebular-select/nebular-select.component.ts
rename to src/app/pages/extra-components/form-inputs/nebular-select/nebular-select.component.ts
diff --git a/src/app/pages/nebular/infinite-list/infinite-list.component.html b/src/app/pages/extra-components/infinite-list/infinite-list.component.html
similarity index 100%
rename from src/app/pages/nebular/infinite-list/infinite-list.component.html
rename to src/app/pages/extra-components/infinite-list/infinite-list.component.html
diff --git a/src/app/pages/nebular/infinite-list/infinite-list.component.scss b/src/app/pages/extra-components/infinite-list/infinite-list.component.scss
similarity index 100%
rename from src/app/pages/nebular/infinite-list/infinite-list.component.scss
rename to src/app/pages/extra-components/infinite-list/infinite-list.component.scss
diff --git a/src/app/pages/nebular/infinite-list/infinite-list.component.ts b/src/app/pages/extra-components/infinite-list/infinite-list.component.ts
similarity index 100%
rename from src/app/pages/nebular/infinite-list/infinite-list.component.ts
rename to src/app/pages/extra-components/infinite-list/infinite-list.component.ts
diff --git a/src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.html b/src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.html
similarity index 100%
rename from src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.html
rename to src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.html
diff --git a/src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.scss b/src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.scss
similarity index 100%
rename from src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.scss
rename to src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.scss
diff --git a/src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.ts b/src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.ts
similarity index 100%
rename from src/app/pages/nebular/infinite-list/news-post-placeholder/news-post-placeholder.component.ts
rename to src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.ts
diff --git a/src/app/pages/nebular/infinite-list/news-post/news-post.component.html b/src/app/pages/extra-components/infinite-list/news-post/news-post.component.html
similarity index 100%
rename from src/app/pages/nebular/infinite-list/news-post/news-post.component.html
rename to src/app/pages/extra-components/infinite-list/news-post/news-post.component.html
diff --git a/src/app/pages/nebular/infinite-list/news-post/news-post.component.ts b/src/app/pages/extra-components/infinite-list/news-post/news-post.component.ts
similarity index 100%
rename from src/app/pages/nebular/infinite-list/news-post/news-post.component.ts
rename to src/app/pages/extra-components/infinite-list/news-post/news-post.component.ts
diff --git a/src/app/pages/nebular/list/fruits-list.ts b/src/app/pages/extra-components/list/fruits-list.ts
similarity index 100%
rename from src/app/pages/nebular/list/fruits-list.ts
rename to src/app/pages/extra-components/list/fruits-list.ts
diff --git a/src/app/pages/nebular/list/list.component.html b/src/app/pages/extra-components/list/list.component.html
similarity index 100%
rename from src/app/pages/nebular/list/list.component.html
rename to src/app/pages/extra-components/list/list.component.html
diff --git a/src/app/pages/nebular/list/list.component.scss b/src/app/pages/extra-components/list/list.component.scss
similarity index 100%
rename from src/app/pages/nebular/list/list.component.scss
rename to src/app/pages/extra-components/list/list.component.scss
diff --git a/src/app/pages/nebular/list/list.component.ts b/src/app/pages/extra-components/list/list.component.ts
similarity index 100%
rename from src/app/pages/nebular/list/list.component.ts
rename to src/app/pages/extra-components/list/list.component.ts
diff --git a/src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html b/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html
similarity index 100%
rename from src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html
rename to src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html
diff --git a/src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss b/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss
similarity index 100%
rename from src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss
rename to src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss
diff --git a/src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts b/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts
similarity index 100%
rename from src/app/pages/nebular/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts
rename to src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts
diff --git a/src/app/pages/nebular/progress-bar/progress-bar.component.html b/src/app/pages/extra-components/progress-bar/progress-bar.component.html
similarity index 100%
rename from src/app/pages/nebular/progress-bar/progress-bar.component.html
rename to src/app/pages/extra-components/progress-bar/progress-bar.component.html
diff --git a/src/app/pages/nebular/progress-bar/progress-bar.component.scss b/src/app/pages/extra-components/progress-bar/progress-bar.component.scss
similarity index 100%
rename from src/app/pages/nebular/progress-bar/progress-bar.component.scss
rename to src/app/pages/extra-components/progress-bar/progress-bar.component.scss
diff --git a/src/app/pages/nebular/progress-bar/progress-bar.component.ts b/src/app/pages/extra-components/progress-bar/progress-bar.component.ts
similarity index 100%
rename from src/app/pages/nebular/progress-bar/progress-bar.component.ts
rename to src/app/pages/extra-components/progress-bar/progress-bar.component.ts
diff --git a/src/app/pages/nebular/services/news.service.ts b/src/app/pages/extra-components/services/news.service.ts
similarity index 100%
rename from src/app/pages/nebular/services/news.service.ts
rename to src/app/pages/extra-components/services/news.service.ts
diff --git a/src/app/pages/nebular/spinner/spinner-color/spinner-color.component.html b/src/app/pages/extra-components/spinner/spinner-color/spinner-color.component.html
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner-color/spinner-color.component.html
rename to src/app/pages/extra-components/spinner/spinner-color/spinner-color.component.html
diff --git a/src/app/pages/nebular/spinner/spinner-color/spinner-color.component.ts b/src/app/pages/extra-components/spinner/spinner-color/spinner-color.component.ts
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner-color/spinner-color.component.ts
rename to src/app/pages/extra-components/spinner/spinner-color/spinner-color.component.ts
diff --git a/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.html b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.html
rename to src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html
diff --git a/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.scss b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
rename to src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
diff --git a/src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.ts b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.ts
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner-in-buttons/spinner-in-buttons.component.ts
rename to src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.ts
diff --git a/src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.html b/src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.html
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.html
rename to src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.html
diff --git a/src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.scss b/src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.scss
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.scss
rename to src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.scss
diff --git a/src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.ts b/src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.ts
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner-in-tabs/spinner-in-tabs.component.ts
rename to src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.ts
diff --git a/src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.html b/src/app/pages/extra-components/spinner/spinner-sizes/spinner-sizes.component.html
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.html
rename to src/app/pages/extra-components/spinner/spinner-sizes/spinner-sizes.component.html
diff --git a/src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.ts b/src/app/pages/extra-components/spinner/spinner-sizes/spinner-sizes.component.ts
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner-sizes/spinner-sizes.component.ts
rename to src/app/pages/extra-components/spinner/spinner-sizes/spinner-sizes.component.ts
diff --git a/src/app/pages/nebular/spinner/spinner.component.html b/src/app/pages/extra-components/spinner/spinner.component.html
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner.component.html
rename to src/app/pages/extra-components/spinner/spinner.component.html
diff --git a/src/app/pages/nebular/spinner/spinner.component.scss b/src/app/pages/extra-components/spinner/spinner.component.scss
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner.component.scss
rename to src/app/pages/extra-components/spinner/spinner.component.scss
diff --git a/src/app/pages/nebular/spinner/spinner.component.ts b/src/app/pages/extra-components/spinner/spinner.component.ts
similarity index 100%
rename from src/app/pages/nebular/spinner/spinner.component.ts
rename to src/app/pages/extra-components/spinner/spinner.component.ts
diff --git a/src/app/pages/nebular/stepper/stepper.component.html b/src/app/pages/extra-components/stepper/stepper.component.html
similarity index 100%
rename from src/app/pages/nebular/stepper/stepper.component.html
rename to src/app/pages/extra-components/stepper/stepper.component.html
diff --git a/src/app/pages/nebular/stepper/stepper.component.scss b/src/app/pages/extra-components/stepper/stepper.component.scss
similarity index 100%
rename from src/app/pages/nebular/stepper/stepper.component.scss
rename to src/app/pages/extra-components/stepper/stepper.component.scss
diff --git a/src/app/pages/nebular/stepper/stepper.component.ts b/src/app/pages/extra-components/stepper/stepper.component.ts
similarity index 100%
rename from src/app/pages/nebular/stepper/stepper.component.ts
rename to src/app/pages/extra-components/stepper/stepper.component.ts
diff --git a/src/app/pages/ui-features/tabs/tabs.component.html b/src/app/pages/extra-components/tabs/tabs.component.html
similarity index 100%
rename from src/app/pages/ui-features/tabs/tabs.component.html
rename to src/app/pages/extra-components/tabs/tabs.component.html
diff --git a/src/app/pages/ui-features/tabs/tabs.component.scss b/src/app/pages/extra-components/tabs/tabs.component.scss
similarity index 100%
rename from src/app/pages/ui-features/tabs/tabs.component.scss
rename to src/app/pages/extra-components/tabs/tabs.component.scss
diff --git a/src/app/pages/ui-features/tabs/tabs.component.ts b/src/app/pages/extra-components/tabs/tabs.component.ts
similarity index 91%
rename from src/app/pages/ui-features/tabs/tabs.component.ts
rename to src/app/pages/extra-components/tabs/tabs.component.ts
index 9f60d3f510..edb783ff3c 100644
--- a/src/app/pages/ui-features/tabs/tabs.component.ts
+++ b/src/app/pages/extra-components/tabs/tabs.component.ts
@@ -32,11 +32,11 @@ export class TabsComponent {
   tabs: any[] = [
     {
       title: 'Route tab #1',
-      route: '/pages/ui-features/tabs/tab1',
+      route: '/pages/extra-components/tabs/tab1',
     },
     {
       title: 'Route tab #2',
-      route: '/pages/ui-features/tabs/tab2',
+      route: '/pages/extra-components/tabs/tab2',
     },
   ];
 
diff --git a/src/app/pages/components/tree/tree.component.html b/src/app/pages/extra-components/tree/tree.component.html
similarity index 100%
rename from src/app/pages/components/tree/tree.component.html
rename to src/app/pages/extra-components/tree/tree.component.html
diff --git a/src/app/pages/components/tree/tree.component.scss b/src/app/pages/extra-components/tree/tree.component.scss
similarity index 100%
rename from src/app/pages/components/tree/tree.component.scss
rename to src/app/pages/extra-components/tree/tree.component.scss
diff --git a/src/app/pages/components/tree/tree.component.ts b/src/app/pages/extra-components/tree/tree.component.ts
similarity index 100%
rename from src/app/pages/components/tree/tree.component.ts
rename to src/app/pages/extra-components/tree/tree.component.ts
diff --git a/src/app/pages/ui-features/buttons/action-groups/action-groups.component.html b/src/app/pages/forms/buttons/action-groups/action-groups.component.html
similarity index 100%
rename from src/app/pages/ui-features/buttons/action-groups/action-groups.component.html
rename to src/app/pages/forms/buttons/action-groups/action-groups.component.html
diff --git a/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss b/src/app/pages/forms/buttons/action-groups/action-groups.component.scss
similarity index 100%
rename from src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss
rename to src/app/pages/forms/buttons/action-groups/action-groups.component.scss
diff --git a/src/app/pages/ui-features/buttons/action-groups/action-groups.component.ts b/src/app/pages/forms/buttons/action-groups/action-groups.component.ts
similarity index 100%
rename from src/app/pages/ui-features/buttons/action-groups/action-groups.component.ts
rename to src/app/pages/forms/buttons/action-groups/action-groups.component.ts
diff --git a/src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.html b/src/app/pages/forms/buttons/block-level-buttons/block-level-buttons.component.html
similarity index 100%
rename from src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.html
rename to src/app/pages/forms/buttons/block-level-buttons/block-level-buttons.component.html
diff --git a/src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.ts b/src/app/pages/forms/buttons/block-level-buttons/block-level-buttons.component.ts
similarity index 100%
rename from src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.ts
rename to src/app/pages/forms/buttons/block-level-buttons/block-level-buttons.component.ts
diff --git a/src/app/pages/ui-features/buttons/button-groups/button-groups.component.html b/src/app/pages/forms/buttons/button-groups/button-groups.component.html
similarity index 100%
rename from src/app/pages/ui-features/buttons/button-groups/button-groups.component.html
rename to src/app/pages/forms/buttons/button-groups/button-groups.component.html
diff --git a/src/app/pages/ui-features/buttons/button-groups/button-groups.component.scss b/src/app/pages/forms/buttons/button-groups/button-groups.component.scss
similarity index 100%
rename from src/app/pages/ui-features/buttons/button-groups/button-groups.component.scss
rename to src/app/pages/forms/buttons/button-groups/button-groups.component.scss
diff --git a/src/app/pages/ui-features/buttons/button-groups/button-groups.component.ts b/src/app/pages/forms/buttons/button-groups/button-groups.component.ts
similarity index 100%
rename from src/app/pages/ui-features/buttons/button-groups/button-groups.component.ts
rename to src/app/pages/forms/buttons/button-groups/button-groups.component.ts
diff --git a/src/app/pages/ui-features/buttons/buttons.component.html b/src/app/pages/forms/buttons/buttons.component.html
similarity index 100%
rename from src/app/pages/ui-features/buttons/buttons.component.html
rename to src/app/pages/forms/buttons/buttons.component.html
diff --git a/src/app/pages/ui-features/buttons/buttons.component.scss b/src/app/pages/forms/buttons/buttons.component.scss
similarity index 100%
rename from src/app/pages/ui-features/buttons/buttons.component.scss
rename to src/app/pages/forms/buttons/buttons.component.scss
diff --git a/src/app/pages/ui-features/buttons/buttons.component.ts b/src/app/pages/forms/buttons/buttons.component.ts
similarity index 100%
rename from src/app/pages/ui-features/buttons/buttons.component.ts
rename to src/app/pages/forms/buttons/buttons.component.ts
diff --git a/src/app/pages/ui-features/buttons/buttons.module.ts b/src/app/pages/forms/buttons/buttons.module.ts
similarity index 100%
rename from src/app/pages/ui-features/buttons/buttons.module.ts
rename to src/app/pages/forms/buttons/buttons.module.ts
diff --git a/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.html b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.html
similarity index 68%
rename from src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.html
rename to src/app/pages/forms/buttons/default-buttons/default-buttons.component.html
index 3346b9cd69..4c3c3b60cb 100644
--- a/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.html
+++ b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.html
@@ -17,7 +17,28 @@
           <span>{{ b.containerTitle }}</span>
         </div>
         <div class="container-btn">
-          <button class="btn {{ b.class }} btn-demo">{{ b.title }}</button>
+          <button *ngIf="!b.bootstrap && !b.outline"
+                  nbButton
+                  status="{{ b.status }}"
+                  class="btn-demo">
+            {{ b.title }}
+          </button>
+          <button *ngIf="b.bootstrap && !b.outline"
+                  class="btn {{ b.class }} btn-demo">
+            {{ b.title }}
+          </button>
+          <button *ngIf="!b.bootstrap && b.outline"
+                  nbButton
+                  outline
+                  status="{{ b.status }}"
+                  class="btn-demo">
+            {{ b.title }}
+          </button>
+          <button *ngIf="b.bootstrap && b.outline"
+                  outline
+                  class="btn {{ b.class }} btn-demo">
+            {{ b.title }}
+          </button>
         </div>
         <div class="{{ b.container }}">
           <div class="state-container">
diff --git a/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.scss b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.scss
similarity index 100%
rename from src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.scss
rename to src/app/pages/forms/buttons/default-buttons/default-buttons.component.scss
diff --git a/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.ts b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.ts
similarity index 83%
rename from src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.ts
rename to src/app/pages/forms/buttons/default-buttons/default-buttons.component.ts
index af7b7078d1..e754912783 100644
--- a/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.ts
+++ b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.ts
@@ -20,36 +20,37 @@ export class DefaultButtonsComponent {
   buttons = {
     'default': [
       {
-        class: 'btn-primary',
+        status: 'primary',
         container: 'primary-container',
         containerTitle: 'Primary Button',
         title: 'Primary',
         default: '#7659ff',
       }, {
-        class: 'btn-warning',
+        status: 'warning',
         container: 'warning-container',
         containerTitle: 'Warning Button',
         title: 'Warning',
         default: '#ffcb17',
       }, {
-        class: 'btn-success',
+        status: 'success',
         container: 'success-container',
         containerTitle: 'Success Button',
         title: 'Success',
         default: '#00d977',
       }, {
-        class: 'btn-info',
+        status: 'info',
         container: 'info-container',
         containerTitle: 'Info Button',
         title: 'Info',
         default: '#0088ff',
       }, {
-        class: 'btn-danger',
+        status: 'danger',
         container: 'danger-container',
         containerTitle: 'Danger Button',
         title: 'Danger',
         default: '#ff386a',
       }, {
+        bootstrap: true,
         class: 'btn-secondary',
         container: 'secondary-container',
         containerTitle: 'Default Button',
@@ -60,36 +61,43 @@ export class DefaultButtonsComponent {
 
     'outline': [
       {
-        class: 'btn-outline-primary',
+        outline: true,
+        status: 'primary',
         container: 'primary-container outline',
         containerTitle: 'Primary Button',
         title: 'Primary',
         default: '#7659ff',
       }, {
-        class: 'btn-outline-warning',
+        outline: true,
+        status: 'warning',
         container: 'warning-container outline',
         containerTitle: 'Warning Button',
         title: 'Warning',
         default: '#ffcb17',
       }, {
-        class: 'btn-outline-success',
+        outline: true,
+        status: 'success',
         container: 'success-container outline',
         containerTitle: 'Success Button',
         title: 'Success',
         default: '#00d977',
       }, {
-        class: 'btn-outline-info',
+        outline: true,
+        status: 'info',
         container: 'info-container',
         containerTitle: 'Info Button',
         title: 'Info',
         default: '#0088ff',
       }, {
-        class: 'btn-outline-danger',
+        outline: true,
+        status: 'danger',
         container: 'danger-container outline',
         containerTitle: 'Danger Button',
         title: 'Danger',
         default: '#ff386a',
       }, {
+        bootstrap: true,
+        outline: true,
         class: 'btn-outline-secondary',
         container: 'secondary-container outline',
         containerTitle: 'Default Button',
diff --git a/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.html b/src/app/pages/forms/buttons/dropdown-buttons/dropdown-button.component.html
similarity index 100%
rename from src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.html
rename to src/app/pages/forms/buttons/dropdown-buttons/dropdown-button.component.html
diff --git a/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.scss b/src/app/pages/forms/buttons/dropdown-buttons/dropdown-button.component.scss
similarity index 100%
rename from src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.scss
rename to src/app/pages/forms/buttons/dropdown-buttons/dropdown-button.component.scss
diff --git a/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.ts b/src/app/pages/forms/buttons/dropdown-buttons/dropdown-button.component.ts
similarity index 100%
rename from src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.ts
rename to src/app/pages/forms/buttons/dropdown-buttons/dropdown-button.component.ts
diff --git a/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.html b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.html
similarity index 93%
rename from src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.html
rename to src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.html
index ff39ea39ac..3b05731d8c 100644
--- a/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.html
+++ b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.html
@@ -7,7 +7,8 @@
           <span>{{ hb.title }}</span>
         </div>
         <div class="container-btn">
-          <button class="btn {{ hb.class }} btn-demo">{{ hb.buttonTitle }}</button>
+          <button *ngIf="!hb.bootstrap" class="btn-demo" nbButton hero status="{{ hb.status }}">{{ hb.buttonTitle }}</button>
+          <button *ngIf="hb.bootstrap" class="btn {{ hb.class }} btn-demo">{{ hb.buttonTitle }}</button>
         </div>
         <div class="{{ hb.container }}">
           <div class="state-container" *ngIf="hb[themeName].border">
diff --git a/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.scss
similarity index 100%
rename from src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss
rename to src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.scss
diff --git a/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.ts b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.ts
similarity index 96%
rename from src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.ts
rename to src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.ts
index c0c22cae73..01e7830db4 100644
--- a/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.ts
+++ b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.ts
@@ -22,7 +22,7 @@ export class HeroButtonComponent implements OnDestroy {
 
   init(colors: any) {
     this.settings = [{
-      class: 'btn-hero-primary',
+      status: 'primary',
       container: 'primary-container',
       title: 'Primary Button',
       buttonTitle: 'Primary',
@@ -48,7 +48,7 @@ export class HeroButtonComponent implements OnDestroy {
         },
       },
     }, {
-      class: 'btn-hero-warning',
+      status: 'warning',
       container: 'warning-container',
       title: 'Warning Button',
       buttonTitle: 'Warning',
@@ -74,7 +74,7 @@ export class HeroButtonComponent implements OnDestroy {
         },
       },
     }, {
-      class: 'btn-hero-success',
+      status: 'success',
       container: 'success-container',
       title: 'Success Button',
       buttonTitle: 'Success',
@@ -100,7 +100,7 @@ export class HeroButtonComponent implements OnDestroy {
         },
       },
     }, {
-      class: 'btn-hero-info',
+      status: 'info',
       container: 'info-container',
       title: 'Info Button',
       buttonTitle: 'Info',
@@ -126,7 +126,7 @@ export class HeroButtonComponent implements OnDestroy {
         },
       },
     }, {
-      class: 'btn-hero-danger',
+      status: 'danger',
       container: 'danger-container',
       title: 'Danger Button',
       buttonTitle: 'Danger',
@@ -152,6 +152,7 @@ export class HeroButtonComponent implements OnDestroy {
         },
       },
     }, {
+      bootstrap: true,
       class: 'btn-hero-secondary',
       container: 'secondary-container',
       title: 'Ghost Button',
diff --git a/src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.html b/src/app/pages/forms/buttons/icon-buttons/icon-buttons.component.html
similarity index 100%
rename from src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.html
rename to src/app/pages/forms/buttons/icon-buttons/icon-buttons.component.html
diff --git a/src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.scss b/src/app/pages/forms/buttons/icon-buttons/icon-buttons.component.scss
similarity index 100%
rename from src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.scss
rename to src/app/pages/forms/buttons/icon-buttons/icon-buttons.component.scss
diff --git a/src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.ts b/src/app/pages/forms/buttons/icon-buttons/icon-buttons.component.ts
similarity index 100%
rename from src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.ts
rename to src/app/pages/forms/buttons/icon-buttons/icon-buttons.component.ts
diff --git a/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.html b/src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.html
similarity index 100%
rename from src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.html
rename to src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.html
diff --git a/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss b/src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.scss
similarity index 100%
rename from src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss
rename to src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.scss
diff --git a/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.ts b/src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.ts
similarity index 100%
rename from src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.ts
rename to src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.ts
diff --git a/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.html b/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.html
similarity index 75%
rename from src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.html
rename to src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.html
index 814c85fc3c..880da47496 100644
--- a/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.html
+++ b/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.html
@@ -10,7 +10,7 @@
         <span>4px</span>
       </div>
       <div>
-        <button class="btn btn-success btn-rectangle btn-demo">Rectangle</button>
+        <button nbButton shape="rectangle" status="success" class="btn-demo">Rectangle</button>
       </div>
     </div>
 
@@ -23,7 +23,7 @@
         <span>12px</span>
       </div>
       <div>
-        <button class="btn btn-success btn-semi-round btn-demo">Semi-round</button>
+        <button nbButton shape="semi-round" status="success" class="btn-demo">Semi-round</button>
       </div>
     </div>
 
@@ -36,7 +36,7 @@
         <span>round</span>
       </div>
       <div>
-        <button class="btn btn-success btn-round btn-demo">Round</button>
+        <button nbButton shape="round" status="success" class="btn-demo">Round</button>
       </div>
     </div>
   </nb-card-body>
diff --git a/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss b/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.scss
similarity index 100%
rename from src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss
rename to src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.scss
diff --git a/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.ts b/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.ts
similarity index 100%
rename from src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.ts
rename to src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.ts
diff --git a/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.html b/src/app/pages/forms/buttons/size-buttons/size-buttons.component.html
similarity index 78%
rename from src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.html
rename to src/app/pages/forms/buttons/size-buttons/size-buttons.component.html
index dda2e2a76a..c76996959d 100644
--- a/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.html
+++ b/src/app/pages/forms/buttons/size-buttons/size-buttons.component.html
@@ -10,7 +10,7 @@
         <span>0.875rem 1.75rem</span>
       </div>
       <div>
-        <button class="btn btn-primary btn-lg">Large Button</button>
+        <button nbButton size="large">Large Button</button>
       </div>
     </div>
     <div class="size-container">
@@ -21,7 +21,7 @@
         <span>0.75rem 1.5rem</span>
       </div>
       <div>
-        <button class="btn btn-primary btn-md">Medium Button</button>
+        <button nbButton size="medium">Medium Button</button>
       </div>
     </div>
     <div class="size-container">
@@ -32,7 +32,7 @@
         <span>0.675rem 1.5rem</span>
       </div>
       <div>
-        <button class="btn btn-primary btn-sm">Small Button</button>
+        <button nbButton size="small">Small Button</button>
       </div>
     </div>
     <div class="size-container">
@@ -43,7 +43,7 @@
         <span>0.5rem 1.25rem</span>
       </div>
       <div>
-        <button class="btn btn-primary btn-xs">X-Small Button</button>
+        <button nbButton size="xsmall">X-Small Button</button>
       </div>
     </div>
   </nb-card-body>
diff --git a/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss b/src/app/pages/forms/buttons/size-buttons/size-buttons.component.scss
similarity index 100%
rename from src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
rename to src/app/pages/forms/buttons/size-buttons/size-buttons.component.scss
diff --git a/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.ts b/src/app/pages/forms/buttons/size-buttons/size-buttons.component.ts
similarity index 100%
rename from src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.ts
rename to src/app/pages/forms/buttons/size-buttons/size-buttons.component.ts
diff --git a/src/app/pages/nebular/datepicker/datepicker.component.html b/src/app/pages/forms/datepicker/datepicker.component.html
similarity index 100%
rename from src/app/pages/nebular/datepicker/datepicker.component.html
rename to src/app/pages/forms/datepicker/datepicker.component.html
diff --git a/src/app/pages/nebular/datepicker/datepicker.component.scss b/src/app/pages/forms/datepicker/datepicker.component.scss
similarity index 100%
rename from src/app/pages/nebular/datepicker/datepicker.component.scss
rename to src/app/pages/forms/datepicker/datepicker.component.scss
diff --git a/src/app/pages/nebular/datepicker/datepicker.component.ts b/src/app/pages/forms/datepicker/datepicker.component.ts
similarity index 100%
rename from src/app/pages/nebular/datepicker/datepicker.component.ts
rename to src/app/pages/forms/datepicker/datepicker.component.ts
diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.html b/src/app/pages/forms/form-inputs/form-inputs.component.html
index 6331c2b7c5..53f560c4d9 100644
--- a/src/app/pages/forms/form-inputs/form-inputs.component.html
+++ b/src/app/pages/forms/form-inputs/form-inputs.component.html
@@ -4,24 +4,30 @@
       <nb-card-header>Default Inputs</nb-card-header>
       <nb-card-body>
         <div class="input-group">
-          <input type="text" placeholder="Project" class="form-control"/>
+          <input type="text" nbInput fullWidth placeholder="Project">
         </div>
         <div class="row full-name-inputs">
           <div class="col-sm-6 input-group">
-            <input type="text" placeholder="Nick" class="form-control"/>
+            <input type="text" nbInput fullWidth placeholder="Nick">
           </div>
           <div class="col-sm-6 input-group">
-            <input type="text" placeholder="Last Name" class="form-control"/>
+            <input type="text" nbInput fullWidth placeholder="Last Name">
           </div>
         </div>
         <div class="input-group">
-          <input type="password" placeholder="Password" class="form-control"/>
+          <input type="password" nbInput fullWidth placeholder="Password">
         </div>
         <div class="input-group has-person-icon">
           <input type="text" placeholder="With Icon" class="form-control"/>
         </div>
-        <div class="input-group input-group-rounded">
-          <input type="text" placeholder="Rounded border" class="form-control"/>
+        <div class="input-group">
+          <input type="text" nbInput fullWidth shape="rectangle" placeholder="Rectangle border">
+        </div>
+        <div class="input-group">
+          <input type="text" nbInput fullWidth shape="semi-round" placeholder="Semi-round border">
+        </div>
+        <div class="input-group">
+          <input type="text" nbInput fullWidth shape="round" placeholder="Rounded border">
         </div>
         <div class="form-group">
           <input type="text" placeholder="Project" class="form-control"/>
@@ -29,16 +35,19 @@
           </small>
         </div>
         <div class="input-group">
-          <input type="text" placeholder="Disabled input" class="form-control" disabled/>
+          <input type="text" nbInput fullWidth placeholder="Disabled input" disabled/>
         </div>
         <div class="input-group">
-          <textarea rows="5" placeholder="Text Area" class="form-control"></textarea>
+          <textarea rows="5" nbInput fullWidth shape="round"  placeholder="Text Area"></textarea>
         </div>
         <div class="input-group input-group-sm">
-          <input type="text" placeholder="Small Input" class="form-control"/>
+          <input type="text" nbInput fullWidth fieldSize="small"  placeholder="Small Input">
         </div>
         <div class="input-group input-group-lg">
-          <input type="text" placeholder="Large Input" class="form-control"/>
+          <input type="text" nbInput fullWidth fieldSize="medium"  placeholder="Medium Input">
+        </div>
+        <div class="input-group input-group-lg">
+          <input type="text" nbInput fullWidth fieldSize="large"  placeholder="Large Input">
         </div>
       </nb-card-body>
     </nb-card>
@@ -137,28 +146,22 @@
       <nb-card-header>Validation States</nb-card-header>
       <nb-card-body>
         <div class="form-group">
-          <input type="text" placeholder="Input with Success" class="form-control form-control-success">
+          <input type="text" nbInput fullWidth status="info"  placeholder="Input with Info">
+        </div>
+        <div class="form-group">
+          <input type="text" nbInput fullWidth status="success"  placeholder="Input with Warning">
         </div>
         <div class="form-group">
-          <input type="text" placeholder="Input with Warning" class="form-control form-control-warning">
+          <input type="text" nbInput fullWidth status="warning"  placeholder="Input with Danger">
         </div>
         <div class="form-group">
-          <input type="text" placeholder="Input with Danger" class="form-control form-control-danger">
+          <input type="text" nbInput fullWidth status="danger" placeholder="Input with Danger">
         </div>
         <div class="form-group validation-checkboxes row">
           <nb-checkbox status="success" class="col-sm-4">Checkbox with Success</nb-checkbox>
           <nb-checkbox status="warning" class="col-sm-4">Checkbox with Warning</nb-checkbox>
           <nb-checkbox status="danger" class="col-sm-4">Checkbox with Danger</nb-checkbox>
         </div>
-        <div class="form-group has-success">
-          <input type="text" placeholder="Input with Success Icon" class="form-control form-control-success">
-        </div>
-        <div class="form-group has-warning">
-          <input type="text" placeholder="Input with Warning Icon" class="form-control form-control-warning">
-        </div>
-        <div class="form-group has-danger">
-          <input type="text" placeholder="Input with Danger Icon" class="form-control form-control-danger">
-        </div>
       </nb-card-body>
     </nb-card>
 
@@ -176,29 +179,29 @@
             </div>
           </div>
           <div class="demo-radio col-sm-4">
-            <label class="custom-control custom-radio">
-              <input type="radio" class="custom-control-input" name="customRadio">
-              <span class="custom-control-indicator"></span>
-              <span class="custom-control-description">Radio 1</span>
-            </label>
-            <label class="custom-control custom-radio">
-              <input type="radio" class="custom-control-input" name="customRadio" checked>
-              <span class="custom-control-indicator"></span>
-              <span class="custom-control-description">Radio 2</span>
-            </label>
-            <label class="custom-control custom-radio">
-              <input type="radio" class="custom-control-input" name="customRadio">
-              <span class="custom-control-indicator"></span>
-              <span class="custom-control-description">Radio 3</span>
-            </label>
+            <nb-radio-group [(value)]="radioGroupValue">
+              <nb-radio
+                [value]="'This is value 1'">
+                Radio 1
+              </nb-radio>
+              <nb-radio
+                [value]="'This is value 2'">
+                Radio 2
+              </nb-radio>
+              <nb-radio
+                [value]="'This is value 3'">
+                Radio 3
+              </nb-radio>
+            </nb-radio-group>
           </div>
           <div class="demo-disabled-checkbox-radio col-sm-4">
             <nb-checkbox disabled>Disabled Checkbox</nb-checkbox>
-            <label class="custom-control custom-radio">
-              <input type="radio" class="custom-control-input" disabled>
-              <span class="custom-control-indicator"></span>
-              <span class="custom-control-description">Disabled Radio</span>
-            </label>
+            <nb-radio-group>
+              <nb-radio
+                [value]="'Disabled Value'">
+                Disabled Radio
+              </nb-radio>
+            </nb-radio-group>
           </div>
         </div>
       </nb-card-body>
diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.ts b/src/app/pages/forms/form-inputs/form-inputs.component.ts
index 6299738fec..4ec7045a01 100644
--- a/src/app/pages/forms/form-inputs/form-inputs.component.ts
+++ b/src/app/pages/forms/form-inputs/form-inputs.component.ts
@@ -9,4 +9,5 @@ export class FormInputsComponent {
 
   starRate = 2;
   heartRate = 4;
+  radioGroupValue = 'This is value 2';
 }
diff --git a/src/app/pages/forms/forms-routing.module.ts b/src/app/pages/forms/forms-routing.module.ts
index 2ce66ace4e..a3ec784d42 100644
--- a/src/app/pages/forms/forms-routing.module.ts
+++ b/src/app/pages/forms/forms-routing.module.ts
@@ -4,17 +4,34 @@ import { Routes, RouterModule } from '@angular/router';
 import { FormsComponent } from './forms.component';
 import { FormInputsComponent } from './form-inputs/form-inputs.component';
 import { FormLayoutsComponent } from './form-layouts/form-layouts.component';
+import { DatepickerComponent } from './datepicker/datepicker.component';
+import { ButtonsComponent } from './buttons/buttons.component';
 
 const routes: Routes = [{
   path: '',
   component: FormsComponent,
-  children: [{
-    path: 'inputs',
-    component: FormInputsComponent,
-  }, {
-    path: 'layouts',
-    component: FormLayoutsComponent,
-  }],
+  children: [
+    {
+      path: 'inputs',
+      component: FormInputsComponent,
+    },
+    {
+      path: 'layouts',
+      component: FormLayoutsComponent,
+    },
+    {
+      path: 'layouts',
+      component: FormLayoutsComponent,
+    },
+    {
+      path: 'buttons',
+      component: ButtonsComponent,
+    },
+    {
+      path: 'datepicker',
+      component: DatepickerComponent,
+    },
+  ],
 }];
 
 @NgModule({
@@ -33,4 +50,5 @@ export const routedComponents = [
   FormsComponent,
   FormInputsComponent,
   FormLayoutsComponent,
+  DatepickerComponent,
 ];
diff --git a/src/app/pages/forms/forms.module.ts b/src/app/pages/forms/forms.module.ts
index f0a2f4eb81..fec35e0158 100644
--- a/src/app/pages/forms/forms.module.ts
+++ b/src/app/pages/forms/forms.module.ts
@@ -2,11 +2,13 @@ import { NgModule } from '@angular/core';
 
 import { ThemeModule } from '../../@theme/theme.module';
 import { FormsRoutingModule, routedComponents } from './forms-routing.module';
+import { ButtonsModule } from './buttons/buttons.module';
 
 @NgModule({
   imports: [
     ThemeModule,
     FormsRoutingModule,
+    ButtonsModule,
   ],
   declarations: [
     ...routedComponents,
diff --git a/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.html b/src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.html
similarity index 100%
rename from src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.html
rename to src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.html
diff --git a/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.scss b/src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.scss
similarity index 100%
rename from src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.scss
rename to src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.scss
diff --git a/src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.ts b/src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.ts
similarity index 100%
rename from src/app/pages/nebular/dialog/dialog-name-prompt/dialog-name-prompt.component.ts
rename to src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.ts
diff --git a/src/app/pages/nebular/dialog/dialog.component.html b/src/app/pages/modal-overlays/dialog/dialog.component.html
similarity index 100%
rename from src/app/pages/nebular/dialog/dialog.component.html
rename to src/app/pages/modal-overlays/dialog/dialog.component.html
diff --git a/src/app/pages/nebular/dialog/dialog.component.scss b/src/app/pages/modal-overlays/dialog/dialog.component.scss
similarity index 100%
rename from src/app/pages/nebular/dialog/dialog.component.scss
rename to src/app/pages/modal-overlays/dialog/dialog.component.scss
diff --git a/src/app/pages/nebular/dialog/dialog.component.ts b/src/app/pages/modal-overlays/dialog/dialog.component.ts
similarity index 100%
rename from src/app/pages/nebular/dialog/dialog.component.ts
rename to src/app/pages/modal-overlays/dialog/dialog.component.ts
diff --git a/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.html b/src/app/pages/modal-overlays/dialog/showcase-dialog/showcase-dialog.component.html
similarity index 100%
rename from src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.html
rename to src/app/pages/modal-overlays/dialog/showcase-dialog/showcase-dialog.component.html
diff --git a/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.scss b/src/app/pages/modal-overlays/dialog/showcase-dialog/showcase-dialog.component.scss
similarity index 100%
rename from src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.scss
rename to src/app/pages/modal-overlays/dialog/showcase-dialog/showcase-dialog.component.scss
diff --git a/src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.ts b/src/app/pages/modal-overlays/dialog/showcase-dialog/showcase-dialog.component.ts
similarity index 100%
rename from src/app/pages/nebular/dialog/showcase-dialog/showcase-dialog.component.ts
rename to src/app/pages/modal-overlays/dialog/showcase-dialog/showcase-dialog.component.ts
diff --git a/src/app/pages/modal-overlays/modal-overlays-routing.module.ts b/src/app/pages/modal-overlays/modal-overlays-routing.module.ts
new file mode 100644
index 0000000000..b2146d86ba
--- /dev/null
+++ b/src/app/pages/modal-overlays/modal-overlays-routing.module.ts
@@ -0,0 +1,49 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { ModalOverlaysComponent } from './modal-overlays.component';
+import { DialogComponent } from './dialog/dialog.component';
+import { WindowComponent } from './window/window.component';
+import { PopoversComponent } from './popovers/popovers.component';
+import { ToastrComponent } from './toastr/toastr.component';
+import { ModalsComponent } from './modals/modals.component';
+import { TooltipComponent } from './tooltip/tooltip.component';
+
+const routes: Routes = [{
+  path: '',
+  component: ModalOverlaysComponent,
+  children: [
+    {
+      path: 'dialog',
+      component: DialogComponent,
+    },
+    {
+      path: 'window',
+      component: WindowComponent,
+    },
+    {
+      path: 'modal',
+      component: ModalsComponent,
+    },
+    {
+      path: 'popover',
+      component: PopoversComponent,
+    },
+    {
+      path: 'tooltip',
+      component: TooltipComponent,
+    },
+    {
+      path: 'toastr',
+      component: ToastrComponent,
+    },
+  ],
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ModalOverlaysRoutingModule {
+}
+
+
diff --git a/src/app/pages/nebular/nebular.component.ts b/src/app/pages/modal-overlays/modal-overlays.component.ts
similarity index 62%
rename from src/app/pages/nebular/nebular.component.ts
rename to src/app/pages/modal-overlays/modal-overlays.component.ts
index ed4bf61973..7511f40e1b 100644
--- a/src/app/pages/nebular/nebular.component.ts
+++ b/src/app/pages/modal-overlays/modal-overlays.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'ngx-nebular',
+  selector: 'ngx-modal-overlays',
   template: `
     <router-outlet></router-outlet>
   `,
 })
 
-export class NebularComponent {
+export class ModalOverlaysComponent {
 }
diff --git a/src/app/pages/modal-overlays/modal-overlays.module.ts b/src/app/pages/modal-overlays/modal-overlays.module.ts
new file mode 100644
index 0000000000..7afb85baa1
--- /dev/null
+++ b/src/app/pages/modal-overlays/modal-overlays.module.ts
@@ -0,0 +1,78 @@
+import { NgModule } from '@angular/core';
+
+// modules
+import { ThemeModule } from '../../@theme/theme.module';
+import { ModalOverlaysRoutingModule } from './modal-overlays-routing.module';
+
+// components
+import { ModalOverlaysComponent } from './modal-overlays.component';
+import { DialogComponent } from './dialog/dialog.component';
+import { ShowcaseDialogComponent } from './dialog/showcase-dialog/showcase-dialog.component';
+import { NbDialogModule, NbWindowModule } from '@nebular/theme';
+import { DialogNamePromptComponent } from './dialog/dialog-name-prompt/dialog-name-prompt.component';
+import { WindowComponent } from './window/window.component';
+import { WindowFormComponent } from './window/window-form/window-form.component';
+import { ToastrComponent } from './toastr/toastr.component';
+import { PopoversComponent } from './popovers/popovers.component';
+import {
+  NgxPopoverCardComponent, NgxPopoverFormComponent,
+  NgxPopoverTabsComponent,
+} from './popovers/popover-examples.component';
+import { ModalsComponent } from './modals/modals.component';
+import { ModalComponent } from './modals/modal/modal.component';
+import { TooltipComponent } from './tooltip/tooltip.component';
+
+
+const COMPONENTS = [
+  ModalOverlaysComponent,
+  ToastrComponent,
+  DialogComponent,
+  ShowcaseDialogComponent,
+  DialogNamePromptComponent,
+  WindowComponent,
+  WindowFormComponent,
+  PopoversComponent,
+  ModalsComponent,
+  ModalComponent,
+  NgxPopoverCardComponent,
+  NgxPopoverFormComponent,
+  NgxPopoverTabsComponent,
+  TooltipComponent,
+];
+
+const ENTRY_COMPONENTS = [
+  ModalComponent,
+  ShowcaseDialogComponent,
+  DialogNamePromptComponent,
+  WindowFormComponent,
+  NgxPopoverCardComponent,
+  NgxPopoverFormComponent,
+  NgxPopoverTabsComponent,
+];
+
+const MODULES = [
+  ThemeModule,
+  ModalOverlaysRoutingModule,
+  NbDialogModule.forChild(),
+  NbWindowModule.forChild(),
+];
+
+const SERVICES = [
+];
+
+@NgModule({
+  imports: [
+    ...MODULES,
+  ],
+  declarations: [
+    ...COMPONENTS,
+  ],
+  providers: [
+    ...SERVICES,
+  ],
+  entryComponents: [
+    ...ENTRY_COMPONENTS,
+  ],
+})
+export class ModalOverlaysModule {
+}
diff --git a/src/app/pages/ui-features/modals/modal/modal.component.html b/src/app/pages/modal-overlays/modals/modal/modal.component.html
similarity index 100%
rename from src/app/pages/ui-features/modals/modal/modal.component.html
rename to src/app/pages/modal-overlays/modals/modal/modal.component.html
diff --git a/src/app/pages/ui-features/modals/modal/modal.component.ts b/src/app/pages/modal-overlays/modals/modal/modal.component.ts
similarity index 100%
rename from src/app/pages/ui-features/modals/modal/modal.component.ts
rename to src/app/pages/modal-overlays/modals/modal/modal.component.ts
diff --git a/src/app/pages/ui-features/modals/modals.component.html b/src/app/pages/modal-overlays/modals/modals.component.html
similarity index 100%
rename from src/app/pages/ui-features/modals/modals.component.html
rename to src/app/pages/modal-overlays/modals/modals.component.html
diff --git a/src/app/pages/ui-features/modals/modals.component.scss b/src/app/pages/modal-overlays/modals/modals.component.scss
similarity index 100%
rename from src/app/pages/ui-features/modals/modals.component.scss
rename to src/app/pages/modal-overlays/modals/modals.component.scss
diff --git a/src/app/pages/ui-features/modals/modals.component.ts b/src/app/pages/modal-overlays/modals/modals.component.ts
similarity index 100%
rename from src/app/pages/ui-features/modals/modals.component.ts
rename to src/app/pages/modal-overlays/modals/modals.component.ts
diff --git a/src/app/pages/ui-features/popovers/popover-examples.component.ts b/src/app/pages/modal-overlays/popovers/popover-examples.component.ts
similarity index 100%
rename from src/app/pages/ui-features/popovers/popover-examples.component.ts
rename to src/app/pages/modal-overlays/popovers/popover-examples.component.ts
diff --git a/src/app/pages/ui-features/popovers/popovers.component.html b/src/app/pages/modal-overlays/popovers/popovers.component.html
similarity index 100%
rename from src/app/pages/ui-features/popovers/popovers.component.html
rename to src/app/pages/modal-overlays/popovers/popovers.component.html
diff --git a/src/app/pages/ui-features/popovers/popovers.component.scss b/src/app/pages/modal-overlays/popovers/popovers.component.scss
similarity index 100%
rename from src/app/pages/ui-features/popovers/popovers.component.scss
rename to src/app/pages/modal-overlays/popovers/popovers.component.scss
diff --git a/src/app/pages/ui-features/popovers/popovers.component.ts b/src/app/pages/modal-overlays/popovers/popovers.component.ts
similarity index 100%
rename from src/app/pages/ui-features/popovers/popovers.component.ts
rename to src/app/pages/modal-overlays/popovers/popovers.component.ts
diff --git a/src/app/pages/components/notifications/notifications.component.html b/src/app/pages/modal-overlays/toastr/toastr.component.html
similarity index 59%
rename from src/app/pages/components/notifications/notifications.component.html
rename to src/app/pages/modal-overlays/toastr/toastr.component.html
index 72563448a9..c264a34505 100644
--- a/src/app/pages/components/notifications/notifications.component.html
+++ b/src/app/pages/modal-overlays/toastr/toastr.component.html
@@ -3,7 +3,6 @@
     Toaster configuration
   </nb-card-header>
   <nb-card-body>
-    <toaster-container [toasterconfig]="config"></toaster-container>
 
     <div class="row">
       <div class="col-md-6 col-sm-12">
@@ -20,19 +19,6 @@
             </ul>
           </div>
         </div>
-        <div class="form-group">
-          <label class="form-control-label">Animation type:</label>
-          <div class="dropdown" ngbDropdown>
-            <button class="btn btn-primary" type="button" ngbDropdownToggle>
-              {{ animationType }}
-            </button>
-            <ul ngbDropdownMenu class="dropdown-menu">
-              <li class="dropdown-item" *ngFor="let at of animations" (click)="animationType = at">
-                {{ at }}
-              </li>
-            </ul>
-          </div>
-        </div>
         <div class="form-group">
           <label class="form-control-label">Title:</label>
           <input class="form-control" [(ngModel)]="title" name="title">
@@ -45,31 +31,26 @@
         </form>
         <div class="form-group">
           <label class="form-control-label">Time to hide toast, ms. 0 to persistent toast:</label>
-          <input class="form-control" type="number" [(ngModel)]="timeout"name="timeout">
+          <input class="form-control" type="number" [(ngModel)]="duration" name="timeout">
         </div>
       </div>
 
       <div class="col-md-6 col-sm-12">
-        <div class="form-group">
-          <label class="form-control-label">Limit number of toasts:</label>
-          <input class="form-control" type="number" [(ngModel)]="toastsLimit" name="limit">
-        </div>
         <div class="form-group">
           <label class="form-control-label">Toast type:</label>
           <div class="dropdown" ngbDropdown>
             <button class="btn btn-primary" type="button" ngbDropdownToggle>
-              {{ type }}
+              {{ status }}
             </button>
             <ul ngbDropdownMenu class="dropdown-menu">
-              <li class="dropdown-item" *ngFor="let t of types" (click)="type = t">{{ t }}</li>
+              <li class="dropdown-item" *ngFor="let t of types" (click)="status = t">{{ t }}</li>
             </ul>
           </div>
         </div>
-
-        <div><nb-checkbox [(ngModel)]="isNewestOnTop">Newest on top</nb-checkbox></div>
-        <div><nb-checkbox [(ngModel)]="isHideOnClick">Hide on click</nb-checkbox></div>
-        <div><nb-checkbox [(ngModel)]="isDuplicatesPrevented">Prevent arising of duplicate toast</nb-checkbox></div>
-        <div><nb-checkbox [(ngModel)]="isCloseButton">Close button</nb-checkbox></div>
+        
+        <div><nb-checkbox [(ngModel)]="destroyByClick">Hide on click</nb-checkbox></div>
+        <div><nb-checkbox [(ngModel)]="preventDuplicates">Prevent arising of duplicate toast</nb-checkbox></div>
+        <div><nb-checkbox [(ngModel)]="hasIcon">Show toast with icon</nb-checkbox></div>
       </div>
     </div>
   </nb-card-body>
@@ -77,6 +58,5 @@
   <nb-card-footer>
     <button class="btn btn-primary" (click)="makeToast()">Show toast</button>
     <button class="btn btn-success" (click)="openRandomToast()">Random toast</button>
-    <button class="btn btn-danger" (click)="clearToasts()">Clear all toasts</button>
   </nb-card-footer>
 </nb-card>
diff --git a/src/app/pages/components/notifications/notifications.component.scss b/src/app/pages/modal-overlays/toastr/toastr.component.scss
similarity index 100%
rename from src/app/pages/components/notifications/notifications.component.scss
rename to src/app/pages/modal-overlays/toastr/toastr.component.scss
diff --git a/src/app/pages/modal-overlays/toastr/toastr.component.ts b/src/app/pages/modal-overlays/toastr/toastr.component.ts
new file mode 100644
index 0000000000..04f7901683
--- /dev/null
+++ b/src/app/pages/modal-overlays/toastr/toastr.component.ts
@@ -0,0 +1,84 @@
+import { Component } from '@angular/core';
+import { ToasterConfig } from 'angular2-toaster';
+
+import 'style-loader!angular2-toaster/toaster.css';
+import { NbGlobalLogicalPosition, NbGlobalPhysicalPosition, NbGlobalPosition, NbToastrService } from '@nebular/theme';
+import { NbToastStatus } from '@nebular/theme/components/toastr/model';
+
+@Component({
+  selector: 'ngx-toastr',
+  styleUrls: ['./toastr.component.scss'],
+  templateUrl: './toastr.component.html',
+})
+export class ToastrComponent {
+  constructor(private toastrService: NbToastrService) {}
+
+  config: ToasterConfig;
+
+  index = 1;
+  destroyByClick = true;
+  duration = 2000;
+  hasIcon = true;
+  position: NbGlobalPosition = NbGlobalPhysicalPosition.TOP_RIGHT;
+  preventDuplicates = false;
+  status: NbToastStatus = NbToastStatus.SUCCESS;
+
+  title = 'HI there!';
+  content = `I'm cool toaster!`;
+
+  types: NbToastStatus[] = [
+    NbToastStatus.DEFAULT,
+    NbToastStatus.DANGER,
+    NbToastStatus.INFO,
+    NbToastStatus.PRIMARY,
+    NbToastStatus.SUCCESS,
+    NbToastStatus.WARNING,
+  ];
+  positions: string[] = [
+    NbGlobalPhysicalPosition.TOP_RIGHT,
+    NbGlobalPhysicalPosition.TOP_LEFT,
+    NbGlobalPhysicalPosition.BOTTOM_LEFT,
+    NbGlobalPhysicalPosition.BOTTOM_RIGHT,
+    NbGlobalLogicalPosition.TOP_END,
+    NbGlobalLogicalPosition.TOP_START,
+    NbGlobalLogicalPosition.BOTTOM_END,
+    NbGlobalLogicalPosition.BOTTOM_START,
+  ];
+
+  quotes = [
+    { title: null, body: 'We rock at Angular' },
+    { title: null, body: 'Titles are not always needed' },
+    { title: null, body: 'Toastr rock!' },
+  ];
+
+  makeToast() {
+    this.showToast(this.status, this.title, this.content);
+  }
+
+  openRandomToast () {
+    const typeIndex = Math.floor(Math.random() * this.types.length);
+    const quoteIndex = Math.floor(Math.random() * this.quotes.length);
+    const type: NbToastStatus = this.types[typeIndex];
+    const quote = this.quotes[quoteIndex];
+
+    this.showToast(type, quote.title, quote.body);
+  }
+
+  private showToast(type: NbToastStatus, title: string, body: string) {
+    const config = {
+      status: type,
+      destroyByClick: this.destroyByClick,
+      duration: this.duration,
+      hasIcon: this.hasIcon,
+      position: this.position,
+      preventDuplicates: this.preventDuplicates,
+    };
+    const titleContent = title ? `. ${title}` : '';
+
+    this.index += 1;
+    this.toastrService.show(
+      body,
+      `Toast ${this.index}${titleContent}`,
+      config);
+  }
+}
diff --git a/src/app/pages/nebular/tooltip/tooltip.component.html b/src/app/pages/modal-overlays/tooltip/tooltip.component.html
similarity index 100%
rename from src/app/pages/nebular/tooltip/tooltip.component.html
rename to src/app/pages/modal-overlays/tooltip/tooltip.component.html
diff --git a/src/app/pages/nebular/tooltip/tooltip.component.scss b/src/app/pages/modal-overlays/tooltip/tooltip.component.scss
similarity index 100%
rename from src/app/pages/nebular/tooltip/tooltip.component.scss
rename to src/app/pages/modal-overlays/tooltip/tooltip.component.scss
diff --git a/src/app/pages/nebular/tooltip/tooltip.component.ts b/src/app/pages/modal-overlays/tooltip/tooltip.component.ts
similarity index 100%
rename from src/app/pages/nebular/tooltip/tooltip.component.ts
rename to src/app/pages/modal-overlays/tooltip/tooltip.component.ts
diff --git a/src/app/pages/nebular/window/window-form/window-form.component.scss b/src/app/pages/modal-overlays/window/window-form/window-form.component.scss
similarity index 100%
rename from src/app/pages/nebular/window/window-form/window-form.component.scss
rename to src/app/pages/modal-overlays/window/window-form/window-form.component.scss
diff --git a/src/app/pages/nebular/window/window-form/window-form.component.ts b/src/app/pages/modal-overlays/window/window-form/window-form.component.ts
similarity index 100%
rename from src/app/pages/nebular/window/window-form/window-form.component.ts
rename to src/app/pages/modal-overlays/window/window-form/window-form.component.ts
diff --git a/src/app/pages/nebular/window/window.component.html b/src/app/pages/modal-overlays/window/window.component.html
similarity index 100%
rename from src/app/pages/nebular/window/window.component.html
rename to src/app/pages/modal-overlays/window/window.component.html
diff --git a/src/app/pages/nebular/window/window.component.scss b/src/app/pages/modal-overlays/window/window.component.scss
similarity index 100%
rename from src/app/pages/nebular/window/window.component.scss
rename to src/app/pages/modal-overlays/window/window.component.scss
diff --git a/src/app/pages/nebular/window/window.component.ts b/src/app/pages/modal-overlays/window/window.component.ts
similarity index 100%
rename from src/app/pages/nebular/window/window.component.ts
rename to src/app/pages/modal-overlays/window/window.component.ts
diff --git a/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.html b/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.html
deleted file mode 100644
index 612af1ae21..0000000000
--- a/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<nb-checkbox>Default Nebular Checkbox</nb-checkbox>
-<nb-checkbox disabled>Disabled Nebular Checkbox</nb-checkbox>
-<nb-checkbox status="success">Success Nebular Checkbox</nb-checkbox>
-<nb-checkbox status="warning">Warning Nebular Checkbox</nb-checkbox>
-<nb-checkbox status="danger">Danger Nebular Checkbox</nb-checkbox>
diff --git a/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.ts b/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.ts
deleted file mode 100644
index 63f1991a83..0000000000
--- a/src/app/pages/nebular/form-inputs/nebular-checkbox/nebular-checkbox.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-nebular-checkbox',
-  templateUrl: 'nebular-checkbox.component.html',
-  styleUrls: ['nebular-checkbox.component.scss'],
-})
-export class NebularCheckboxComponent {
-
-}
diff --git a/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.html b/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.html
deleted file mode 100644
index d175270a23..0000000000
--- a/src/app/pages/nebular/form-inputs/nebular-form-inputs.component.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="row">
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
-    <ngx-nebular-inputs></ngx-nebular-inputs>
-  </div>
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
-    <nb-card>
-      <nb-card-header>Checkbox & Radio </nb-card-header>
-      <nb-card-body>
-        <div class="row">
-          <div class="col-md-12 col-lg-12 col-xxxl-6 inputs-group-margin-bottom">
-            <ngx-nebular-checkbox></ngx-nebular-checkbox>
-          </div>
-          <div class="col-md-12 col-lg-12 col-xxxl-6 inputs-group-margin-bottom">
-            <ngx-nebular-radio-group></ngx-nebular-radio-group>
-          </div>
-        </div>
-      </nb-card-body>
-    </nb-card>
-    <ngx-nebular-select></ngx-nebular-select>
-  </div>
-</div>
diff --git a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
deleted file mode 100644
index 77b665de9d..0000000000
--- a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<div class="row">
-  <div class="col-md-12 col-lg-6 col-xxxl-6">
-    <nb-card>
-      <nb-card-header>Input Size</nb-card-header>
-      <nb-card-body>
-        <input type="text" nbInput fullWidth fieldSize="small" placeholder="Small">
-        <input type="text" nbInput fullWidth fieldSize="medium" placeholder="Medium">
-        <input type="text" nbInput fullWidth fieldSize="large" placeholder="Large">
-      </nb-card-body>
-    </nb-card>
-  </div>
-
-  <div class="col-md-12 col-lg-6 col-xxxl-6">
-    <nb-card>
-      <nb-card-header>Input Shapes</nb-card-header>
-      <nb-card-body>
-        <input type="text" nbInput fullWidth shape="rectangle" placeholder="Rectangle">
-        <input type="text" nbInput fullWidth shape="semi-round" placeholder="Semi round">
-        <input type="text" nbInput fullWidth shape="round" placeholder="Round">
-      </nb-card-body>
-    </nb-card>
-  </div>
-
-  <div class="col-md-12 col-lg-6 col-xxxl-6">
-    <nb-card>
-      <nb-card-header>Full Width Inputs</nb-card-header>
-      <nb-card-body>
-        <input type="text" nbInput placeholder="Initial width">
-        <input type="text" nbInput fullWidth placeholder="Full width">
-        <textarea nbInput placeholder="Initial width"></textarea>
-        <textarea nbInput fullWidth placeholder="Full width"></textarea>
-      </nb-card-body>
-    </nb-card>
-  </div>
-
-  <div class="col-md-12 col-lg-6 col-xxxl-6">
-    <nb-card>
-      <nb-card-header>Input Colors</nb-card-header>
-      <nb-card-body>
-        <input type="text" nbInput fullWidth status="info" placeholder="Info">
-        <input type="text" nbInput fullWidth status="success" placeholder="Success">
-        <input type="text" nbInput fullWidth status="warning" placeholder="Warning">
-        <input type="text" nbInput fullWidth status="danger" placeholder="Danger">
-      </nb-card-body>
-    </nb-card>
-  </div>
-
-  <div class="col-md-12 col-lg-6 col-xxxl-6">
-    <nb-card>
-      <nb-card-header>Input Elements</nb-card-header>
-      <nb-card-body>
-        <input type="text" nbInput fullWidth fieldSize="small" placeholder="Input">
-        <textarea nbInput fullWidth shape="round" placeholder="Textarea"></textarea>
-      </nb-card-body>
-    </nb-card>
-  </div>
-</div>
diff --git a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.scss b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.scss
deleted file mode 100644
index 09aba6118d..0000000000
--- a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@import '../../../../@theme/styles/themes';
-
-@include nb-install-component() {
-  [nbInput] {
-    margin-bottom: 1rem;
-  }
-}
diff --git a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.ts b/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.ts
deleted file mode 100644
index e78a41db1e..0000000000
--- a/src/app/pages/nebular/form-inputs/nebular-inputs/nebular-inputs.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-nebular-inputs',
-  templateUrl: 'nebular-inputs.component.html',
-  styleUrls: ['nebular-inputs.component.scss'],
-})
-export class NebularInputsComponent {
-
-}
diff --git a/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.html b/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.html
deleted file mode 100644
index 990a10f3f8..0000000000
--- a/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div>Selected value: <span class="value">{{ option }}</span></div>
-
-<nb-radio-group [(ngModel)]="option">
-  <nb-radio
-    *ngFor="let option of options"
-    [disabled]="option.disabled"
-    [value]="option.value">
-    {{ option.label }}
-  </nb-radio>
-</nb-radio-group>
diff --git a/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.scss b/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.scss
deleted file mode 100644
index 40c88c55fb..0000000000
--- a/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@import '../../../../@theme/styles/themes';
-
-@include nb-install-component() {
-  .value {
-    font-weight: nb-theme(font-weight-bold);
-  }
-  
-  nb-radio-group {
-    display: block;
-    margin-top: 0.5rem;
-  }
-}
diff --git a/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.ts b/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.ts
deleted file mode 100644
index b53681f8d1..0000000000
--- a/src/app/pages/nebular/form-inputs/nebular-radio-group/nebular-radio-group.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-nebular-radio-group',
-  templateUrl: 'nebular-radio-group.component.html',
-  styleUrls: ['nebular-radio-group.component.scss'],
-})
-export class NebularRadioGroupComponent {
-  options = [
-    { value: 'This is value 1', label: 'Option 1' },
-    { value: 'This is value 2', label: 'Option 2 Disabled', disabled: true },
-    { value: 'This is value 3', label: 'Option 3' },
-    { value: 'This is value 5', label: 'Option 4' },
-  ];
-  option;
-}
diff --git a/src/app/pages/nebular/toastr/toastr.component.html b/src/app/pages/nebular/toastr/toastr.component.html
deleted file mode 100644
index beef652c4c..0000000000
--- a/src/app/pages/nebular/toastr/toastr.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<nb-card>
-  <nb-card-header>Toastr</nb-card-header>
-</nb-card>
diff --git a/src/app/pages/nebular/toastr/toastr.component.scss b/src/app/pages/nebular/toastr/toastr.component.scss
deleted file mode 100644
index d5badf91b4..0000000000
--- a/src/app/pages/nebular/toastr/toastr.component.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import '../../../@theme/styles/themes';
-
-@include nb-install-component() {
-
-}
diff --git a/src/app/pages/nebular/toastr/toastr.component.ts b/src/app/pages/nebular/toastr/toastr.component.ts
deleted file mode 100644
index 1dfd05a776..0000000000
--- a/src/app/pages/nebular/toastr/toastr.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-toastr',
-  templateUrl: 'toastr.component.html',
-  styleUrls: ['toastr.component.scss'],
-})
-export class ToastrComponent {
-
-}
diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts
index 9f61dcbbe5..7d4cfcc118 100644
--- a/src/app/pages/pages-menu.ts
+++ b/src/app/pages/pages-menu.ts
@@ -17,64 +17,78 @@ export const MENU_ITEMS: NbMenuItem[] = [
     group: true,
   },
   {
-    title: 'Nebular',
-    icon: 'nb-keypad',
+    title: 'Extra Components',
+    icon: 'nb-gear',
     children: [
       {
         title: 'Calendar',
-        link: '/pages/nebular/calendar',
+        link: '/pages/extra-components/calendar',
       },
       {
-        title: 'Datepicker',
-        link: '/pages/nebular/datepicker',
+        title: 'Stepper',
+        link: '/pages/extra-components/stepper',
       },
       {
-        title: 'Stepper',
-        link: '/pages/nebular/stepper',
+        title: 'List',
+        link: '/pages/extra-components/list',
       },
       {
-        title: 'Accordion',
-        link: '/pages/nebular/accordion',
+        title: 'Infinite List',
+        link: '/pages/extra-components/infinite-list',
       },
       {
-        title: 'Dialog',
-        link: '/pages/nebular/dialog',
+        title: 'Accordion',
+        link: '/pages/extra-components/accordion',
       },
       {
-        title: 'Window',
-        link: '/pages/nebular/window',
+        title: 'Progress Bar',
+        link: '/pages/extra-components/progress-bar',
       },
       {
-        title: 'List',
-        link: '/pages/nebular/list',
+        title: 'Spinner',
+        link: '/pages/extra-components/spinner',
       },
       {
-        title: 'Infinite List',
-        link: '/pages/nebular/infinite-list',
+        title: 'Alert',
+        link: '/pages/extra-components/alert',
       },
       {
-        title: 'Tooltip',
-        link: '/pages/nebular/tooltip',
+        title: 'Tree',
+        link: '/pages/extra-components/tree',
       },
       {
-        title: 'Alert',
-        link: '/pages/nebular/alert',
+        title: 'Tabs',
+        link: '/pages/extra-components/tabs',
       },
       {
-        title: 'Progress Bar',
-        link: '/pages/nebular/progress-bar',
+        title: 'Calendar Kit',
+        link: '/pages/extra-components/calendar-kit',
       },
       {
-        title: 'Spinner',
-        link: '/pages/nebular/spinner',
+        title: 'Chat',
+        link: '/pages/extra-components/chat',
       },
+    ],
+  },
+  {
+    title: 'Forms',
+    icon: 'nb-compose',
+    children: [
       {
         title: 'Form Inputs',
-        link: '/pages/nebular/form-inputs',
+        link: '/pages/forms/inputs',
       },
       {
-        title: 'Chat',
-        link: '/pages/nebular/chat',
+        title: 'Form Layouts',
+        link: '/pages/forms/layouts',
+      },
+      {
+        title: 'Buttons',
+        link: '/pages/forms/buttons',
+      },
+      {
+        title: 'Datepicker',
+        link: '/pages/forms/datepicker',
       },
     ],
   },
@@ -83,10 +97,6 @@ export const MENU_ITEMS: NbMenuItem[] = [
     icon: 'nb-keypad',
     link: '/pages/ui-features',
     children: [
-      {
-        title: 'Buttons',
-        link: '/pages/ui-features/buttons',
-      },
       {
         title: 'Grid',
         link: '/pages/ui-features/grid',
@@ -95,14 +105,6 @@ export const MENU_ITEMS: NbMenuItem[] = [
         title: 'Icons',
         link: '/pages/ui-features/icons',
       },
-      {
-        title: 'Modals',
-        link: '/pages/ui-features/modals',
-      },
-      {
-        title: 'Popovers',
-        link: '/pages/ui-features/popovers',
-      },
       {
         title: 'Typography',
         link: '/pages/ui-features/typography',
@@ -111,36 +113,35 @@ export const MENU_ITEMS: NbMenuItem[] = [
         title: 'Animated Searches',
         link: '/pages/ui-features/search-fields',
       },
-      {
-        title: 'Tabs',
-        link: '/pages/ui-features/tabs',
-      },
     ],
   },
   {
-    title: 'Forms',
-    icon: 'nb-compose',
+    title: 'Modal & Overlays',
+    icon: 'nb-layout-default',
     children: [
       {
-        title: 'Form Inputs',
-        link: '/pages/forms/inputs',
+        title: 'Dialog',
+        link: '/pages/modal-overlays/dialog',
       },
       {
-        title: 'Form Layouts',
-        link: '/pages/forms/layouts',
+        title: 'Window',
+        link: '/pages/modal-overlays/window',
       },
-    ],
-  },
-  {
-    title: 'Components',
-    icon: 'nb-gear',
-    children: [
       {
-        title: 'Tree',
-        link: '/pages/components/tree',
-      }, {
-        title: 'Notifications',
-        link: '/pages/components/notifications',
+        title: 'Modal',
+        link: '/pages/modal-overlays/modal',
+      },
+      {
+        title: 'Popover',
+        link: '/pages/modal-overlays/popover',
+      },
+      {
+        title: 'Toastr',
+        link: '/pages/modal-overlays/toastr',
+      },
+      {
+        title: 'Tooltip',
+        link: '/pages/modal-overlays/tooltip',
       },
     ],
   },
diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts
index e59053afb8..e65e802454 100644
--- a/src/app/pages/pages-routing.module.ts
+++ b/src/app/pages/pages-routing.module.ts
@@ -15,15 +15,15 @@ const routes: Routes = [{
   }, {
     path: 'iot-dashboard',
     component: DashboardComponent,
-  }, {
-    path: 'nebular',
-    loadChildren: './nebular/nebular.module#NebularModule',
   }, {
     path: 'ui-features',
     loadChildren: './ui-features/ui-features.module#UiFeaturesModule',
   }, {
-    path: 'components',
-    loadChildren: './components/components.module#ComponentsModule',
+    path: 'modal-overlays',
+    loadChildren: './modal-overlays/modal-overlays.module#ModalOverlaysModule',
+  }, {
+    path: 'extra-components',
+    loadChildren: './extra-components/extra-components.module#ExtraComponentsModule',
   }, {
     path: 'maps',
     loadChildren: './maps/maps.module#MapsModule',
diff --git a/src/app/pages/ui-features/icons/icons.component.ts b/src/app/pages/ui-features/icons/icons.component.ts
index bd631ba71c..89ed70c926 100644
--- a/src/app/pages/ui-features/icons/icons.component.ts
+++ b/src/app/pages/ui-features/icons/icons.component.ts
@@ -27,7 +27,7 @@ export class IconsComponent {
       'nb-skip-backward-outline', 'nb-skip-forward', 'nb-skip-forward-outline', 'nb-snowy-circled',
       'nb-square', 'nb-square-outline', 'nb-star', 'nb-sunny', 'nb-sunny-circled', 'nb-tables', 'nb-title',
       'nb-trash', 'nb-volume-high', 'nb-volume-mute', 'nb-drop', 'nb-drops', 'nb-info', 'nb-expand', 'nb-collapse',
-      'nb-e-commerce'],
+      'nb-e-commerce', 'nb-danger', 'nb-checkmark-circle', 'nb-help'],
 
     ionicons: [
       'ion-ionic', 'ion-arrow-right-b', 'ion-arrow-down-b', 'ion-arrow-left-b', 'ion-arrow-up-c', 'ion-arrow-right-c',
diff --git a/src/app/pages/ui-features/ui-features-routing.module.ts b/src/app/pages/ui-features/ui-features-routing.module.ts
index e4717e0dd5..912fb5d0dd 100644
--- a/src/app/pages/ui-features/ui-features-routing.module.ts
+++ b/src/app/pages/ui-features/ui-features-routing.module.ts
@@ -2,53 +2,26 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
 import { UiFeaturesComponent } from './ui-features.component';
-import { ButtonsComponent } from './buttons/buttons.component';
 import { GridComponent } from './grid/grid.component';
 import { IconsComponent } from './icons/icons.component';
-import { ModalsComponent } from './modals/modals.component';
 import { TypographyComponent } from './typography/typography.component';
-import { TabsComponent, Tab1Component, Tab2Component } from './tabs/tabs.component';
 import { SearchComponent } from './search-fields/search-fields.component';
-import { PopoversComponent } from './popovers/popovers.component';
 
 const routes: Routes = [{
   path: '',
   component: UiFeaturesComponent,
-  children: [{
-    path: 'buttons',
-    component: ButtonsComponent,
-  }, {
+  children: [ {
     path: 'grid',
     component: GridComponent,
   }, {
     path: 'icons',
     component: IconsComponent,
-  }, {
-    path: 'modals',
-    component: ModalsComponent,
-  }, {
-    path: 'popovers',
-    component: PopoversComponent,
   }, {
     path: 'typography',
     component: TypographyComponent,
   }, {
     path: 'search-fields',
     component: SearchComponent,
-  }, {
-    path: 'tabs',
-    component: TabsComponent,
-    children: [{
-      path: '',
-      redirectTo: 'tab1',
-      pathMatch: 'full',
-    }, {
-      path: 'tab1',
-      component: Tab1Component,
-    }, {
-      path: 'tab2',
-      component: Tab2Component,
-    }],
   }],
 }];
 
diff --git a/src/app/pages/ui-features/ui-features.module.ts b/src/app/pages/ui-features/ui-features.module.ts
index facb28d004..16ee1b88da 100644
--- a/src/app/pages/ui-features/ui-features.module.ts
+++ b/src/app/pages/ui-features/ui-features.module.ts
@@ -1,53 +1,28 @@
 import { NgModule } from '@angular/core';
 
 import { ThemeModule } from '../../@theme/theme.module';
-import { ButtonsModule } from './buttons/buttons.module';
 import { UiFeaturesRoutingModule } from './ui-features-routing.module';
 import { UiFeaturesComponent } from './ui-features.component';
 import { GridComponent } from './grid/grid.component';
-import { ModalsComponent } from './modals/modals.component';
 import { IconsComponent } from './icons/icons.component';
-import { ModalComponent } from './modals/modal/modal.component';
 import { TypographyComponent } from './typography/typography.component';
-import { TabsComponent, Tab1Component, Tab2Component } from './tabs/tabs.component';
 import { SearchComponent } from './search-fields/search-fields.component';
-import { PopoversComponent } from './popovers/popovers.component';
-import {
-  NgxPopoverCardComponent, NgxPopoverFormComponent,
-  NgxPopoverTabsComponent,
-} from './popovers/popover-examples.component';
 
 const components = [
   UiFeaturesComponent,
   GridComponent,
-  ModalsComponent,
   IconsComponent,
-  ModalComponent,
   TypographyComponent,
-  TabsComponent,
-  Tab1Component,
-  Tab2Component,
   SearchComponent,
-  PopoversComponent,
-  NgxPopoverCardComponent,
-  NgxPopoverFormComponent,
-  NgxPopoverTabsComponent,
 ];
 
 @NgModule({
   imports: [
     ThemeModule,
     UiFeaturesRoutingModule,
-    ButtonsModule,
   ],
   declarations: [
     ...components,
   ],
-  entryComponents: [
-    ModalComponent,
-    NgxPopoverCardComponent,
-    NgxPopoverFormComponent,
-    NgxPopoverTabsComponent,
-  ],
 })
 export class UiFeaturesModule { }

From cf3ee1c904a2282891d1159569532e00d6431c40 Mon Sep 17 00:00:00 2001
From: denStrigo <d.strigo@akveo.com>
Date: Mon, 19 Nov 2018 16:34:21 +0300
Subject: [PATCH 11/11] feat(components): add bootstrap feature module

---
 package-lock.json                             |  24 +-
 package.json                                  |   8 +-
 .../bootstrap/bootstrap-routing.module.ts     |  33 +++
 .../pages/bootstrap/bootstrap.component.ts    |  10 +
 src/app/pages/bootstrap/bootstrap.module.ts   |  36 +++
 .../block-level-buttons.component.html        |   0
 .../block-level-buttons.component.ts          |   0
 .../button-groups.component.html              |   0
 .../button-groups.component.scss              |   0
 .../button-groups/button-groups.component.ts  |   0
 .../bootstrap/buttons/buttons.component.html  |  23 ++
 .../bootstrap/buttons/buttons.component.scss  | 103 +++++++
 .../bootstrap/buttons/buttons.component.ts    |   9 +
 .../pages/bootstrap/buttons/buttons.module.ts |  38 +++
 .../default-buttons.component.html            |  48 ++++
 .../default-buttons.component.scss            | 126 +++++++++
 .../default-buttons.component.ts              | 101 +++++++
 .../dropdown-button.component.html            |   0
 .../dropdown-button.component.scss            |   0
 .../dropdown-button.component.ts              |   0
 .../hero-buttons/hero-buttons.component.html  |  72 +++++
 .../hero-buttons/hero-buttons.component.scss  | 135 +++++++++
 .../hero-buttons/hero-buttons.component.ts    | 180 ++++++++++++
 .../icon-buttons/icon-buttons.component.html  |   0
 .../icon-buttons/icon-buttons.component.scss  |   0
 .../icon-buttons/icon-buttons.component.ts    |   0
 .../shape-buttons.component.html              |  43 +++
 .../shape-buttons.component.scss              |  30 ++
 .../shape-buttons/shape-buttons.component.ts  |   9 +
 .../size-buttons/size-buttons.component.html  |  50 ++++
 .../size-buttons/size-buttons.component.scss  |  26 ++
 .../size-buttons/size-buttons.component.ts    |   9 +
 .../form-inputs/form-inputs.component.html    | 235 ++++++++++++++++
 .../form-inputs/form-inputs.component.scss    | 130 +++++++++
 .../form-inputs/form-inputs.component.ts      |  12 +
 .../modals/modal/modal.component.html         |   0
 .../modals/modal/modal.component.ts           |   0
 .../modals/modals.component.html              |   0
 .../modals/modals.component.scss              |   0
 .../modals/modals.component.ts                |   0
 .../button-elements.component.html            |  17 ++
 .../button-elements.component.scss            |  15 +
 .../button-elements.component.ts              |  12 +
 .../forms/buttons/buttons.component.html      |  15 +-
 src/app/pages/forms/buttons/buttons.module.ts |  12 +-
 .../default-buttons.component.html            |  29 +-
 .../default-buttons.component.scss            |  14 +-
 .../default-buttons.component.ts              | 136 +++------
 .../hero-buttons/hero-buttons.component.html  |   3 +-
 .../hero-buttons/hero-buttons.component.scss  |   9 +
 .../hero-buttons/hero-buttons.component.ts    | 257 +++++++++---------
 .../outline-buttons.component.html            |  45 +++
 .../outline-buttons.component.scss            | 130 +++++++++
 .../outline-buttons.component.ts              |  47 ++++
 .../form-inputs/form-inputs.component.html    | 128 +--------
 .../modal-overlays-routing.module.ts          |   5 -
 .../modal-overlays/modal-overlays.module.ts   |   5 -
 src/app/pages/pages-menu.ts                   |  24 +-
 src/app/pages/pages-routing.module.ts         |   3 +
 59 files changed, 1949 insertions(+), 447 deletions(-)
 create mode 100644 src/app/pages/bootstrap/bootstrap-routing.module.ts
 create mode 100644 src/app/pages/bootstrap/bootstrap.component.ts
 create mode 100644 src/app/pages/bootstrap/bootstrap.module.ts
 rename src/app/pages/{forms => bootstrap}/buttons/block-level-buttons/block-level-buttons.component.html (100%)
 rename src/app/pages/{forms => bootstrap}/buttons/block-level-buttons/block-level-buttons.component.ts (100%)
 rename src/app/pages/{forms => bootstrap}/buttons/button-groups/button-groups.component.html (100%)
 rename src/app/pages/{forms => bootstrap}/buttons/button-groups/button-groups.component.scss (100%)
 rename src/app/pages/{forms => bootstrap}/buttons/button-groups/button-groups.component.ts (100%)
 create mode 100644 src/app/pages/bootstrap/buttons/buttons.component.html
 create mode 100644 src/app/pages/bootstrap/buttons/buttons.component.scss
 create mode 100644 src/app/pages/bootstrap/buttons/buttons.component.ts
 create mode 100644 src/app/pages/bootstrap/buttons/buttons.module.ts
 create mode 100644 src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.html
 create mode 100644 src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.scss
 create mode 100644 src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.ts
 rename src/app/pages/{forms => bootstrap}/buttons/dropdown-buttons/dropdown-button.component.html (100%)
 rename src/app/pages/{forms => bootstrap}/buttons/dropdown-buttons/dropdown-button.component.scss (100%)
 rename src/app/pages/{forms => bootstrap}/buttons/dropdown-buttons/dropdown-button.component.ts (100%)
 create mode 100644 src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.html
 create mode 100644 src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.scss
 create mode 100644 src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.ts
 rename src/app/pages/{forms => bootstrap}/buttons/icon-buttons/icon-buttons.component.html (100%)
 rename src/app/pages/{forms => bootstrap}/buttons/icon-buttons/icon-buttons.component.scss (100%)
 rename src/app/pages/{forms => bootstrap}/buttons/icon-buttons/icon-buttons.component.ts (100%)
 create mode 100644 src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.html
 create mode 100644 src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.scss
 create mode 100644 src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.ts
 create mode 100644 src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.html
 create mode 100644 src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.scss
 create mode 100644 src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.ts
 create mode 100644 src/app/pages/bootstrap/form-inputs/form-inputs.component.html
 create mode 100644 src/app/pages/bootstrap/form-inputs/form-inputs.component.scss
 create mode 100644 src/app/pages/bootstrap/form-inputs/form-inputs.component.ts
 rename src/app/pages/{modal-overlays => bootstrap}/modals/modal/modal.component.html (100%)
 rename src/app/pages/{modal-overlays => bootstrap}/modals/modal/modal.component.ts (100%)
 rename src/app/pages/{modal-overlays => bootstrap}/modals/modals.component.html (100%)
 rename src/app/pages/{modal-overlays => bootstrap}/modals/modals.component.scss (100%)
 rename src/app/pages/{modal-overlays => bootstrap}/modals/modals.component.ts (100%)
 create mode 100644 src/app/pages/forms/buttons/button-elements/button-elements.component.html
 create mode 100644 src/app/pages/forms/buttons/button-elements/button-elements.component.scss
 create mode 100644 src/app/pages/forms/buttons/button-elements/button-elements.component.ts
 create mode 100644 src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.html
 create mode 100644 src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.scss
 create mode 100644 src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.ts

diff --git a/package-lock.json b/package-lock.json
index 460f5e715a..6711d2fc41 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -704,24 +704,24 @@
       "dev": true
     },
     "@nebular/auth": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@nebular/auth/-/auth-2.0.1.tgz",
-      "integrity": "sha512-YfbkRiCT2mj2N3T3O8KqnhiLebhG8Ixq+AMdtASnEBcHeIn4Of3GfyBMENvHpJfDO7FTdJcrt1//4PE6e6vm5Q=="
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@nebular/auth/-/auth-2.0.2.tgz",
+      "integrity": "sha512-n2hvp6DUjrkOMEIilFsXQ2+EdPsS5zb9AGn+RaWusQl5RLG7ALYR3smiwmG11QKEnWyg5y8UoUdE7BVjZjf50A=="
     },
     "@nebular/bootstrap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@nebular/bootstrap/-/bootstrap-2.0.1.tgz",
-      "integrity": "sha512-rL5PF7HmKrPTpG3H2wkgjm1pcxXTcKJW6sLPAtrfkLDatlKsZSBdobrQ1LeqMs2NOay76OAhr37f986iXQstIA=="
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@nebular/bootstrap/-/bootstrap-2.0.2.tgz",
+      "integrity": "sha512-2Bh7FhXXorRZkOmo3Mq6EuoW2VicqSMZgrfH48WLwwvuc+/TcLE8KgTEiUI6sYfdVDsoWLCb53iyE7zWWBS5Mg=="
     },
     "@nebular/security": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@nebular/security/-/security-2.0.1.tgz",
-      "integrity": "sha512-5TDaEfdSEsAQeFg9S9oQ0+OPtMDWIkxBicIFwqqv/UMcg4or87GCvLWJnc3j2XKFH/GWTUeJ32aGqj1NT5Ul7Q=="
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@nebular/security/-/security-2.0.2.tgz",
+      "integrity": "sha512-+1qSEuTjxHkqA7+84EbMO/NkzlDg1BkiQeceyfwLJIbIcfNv0+/J+h5VOq7r5FmjOLt/8JyP33WHpbEx68tOvA=="
     },
     "@nebular/theme": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@nebular/theme/-/theme-2.0.1.tgz",
-      "integrity": "sha512-dNbd4dL/wfP/1qsRLaerCqEgQMNsu7zWnxfUj8HyDqxMWQw/2zwDAR0wlZMe5YW7IfVPT3j5HucRmb1oW3VnJQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@nebular/theme/-/theme-2.0.2.tgz",
+      "integrity": "sha512-wJZ/hIckGNes+OgvWtG/TB2cXQ1YUfiC3CPSa9hBZ6KLohqmg8AWZEUIuCsdpjLcma8DFOypsvj+VSDeDEaZyw==",
       "requires": {
         "intersection-observer": "0.5.0"
       }
diff --git a/package.json b/package.json
index ac41891963..119e92d64f 100644
--- a/package.json
+++ b/package.json
@@ -46,10 +46,10 @@
     "@angular/platform-browser-dynamic": "6.0.0",
     "@angular/router": "6.0.0",
     "@asymmetrik/ngx-leaflet": "3.0.1",
-    "@nebular/auth": "2.0.1",
-    "@nebular/bootstrap": "2.0.1",
-    "@nebular/security": "2.0.1",
-    "@nebular/theme": "2.0.1",
+    "@nebular/auth": "2.0.2",
+    "@nebular/bootstrap": "2.0.2",
+    "@nebular/security": "2.0.2",
+    "@nebular/theme": "2.0.2",
     "@ng-bootstrap/ng-bootstrap": "1.0.0",
     "@swimlane/ngx-charts": "7.0.1",
     "angular-tree-component": "7.2.0",
diff --git a/src/app/pages/bootstrap/bootstrap-routing.module.ts b/src/app/pages/bootstrap/bootstrap-routing.module.ts
new file mode 100644
index 0000000000..b7aa642b25
--- /dev/null
+++ b/src/app/pages/bootstrap/bootstrap-routing.module.ts
@@ -0,0 +1,33 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { BootstrapComponent } from './bootstrap.component';
+import { ModalsComponent } from './modals/modals.component';
+import { ButtonsComponent } from './buttons/buttons.component';
+import { FormInputsComponent } from './form-inputs/form-inputs.component';
+
+
+const routes: Routes = [{
+  path: '',
+  component: BootstrapComponent,
+  children: [
+    {
+      path: 'inputs',
+      component: FormInputsComponent,
+    },
+    {
+      path: 'buttons',
+      component: ButtonsComponent,
+    },
+    {
+      path: 'modal',
+      component: ModalsComponent,
+    },
+  ],
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class BootstrapRoutingModule { }
diff --git a/src/app/pages/bootstrap/bootstrap.component.ts b/src/app/pages/bootstrap/bootstrap.component.ts
new file mode 100644
index 0000000000..339c782330
--- /dev/null
+++ b/src/app/pages/bootstrap/bootstrap.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-bootstrap',
+  template: `
+    <router-outlet></router-outlet>
+  `,
+})
+export class BootstrapComponent {
+}
diff --git a/src/app/pages/bootstrap/bootstrap.module.ts b/src/app/pages/bootstrap/bootstrap.module.ts
new file mode 100644
index 0000000000..361d00a7a1
--- /dev/null
+++ b/src/app/pages/bootstrap/bootstrap.module.ts
@@ -0,0 +1,36 @@
+import { NgModule } from '@angular/core';
+
+import { ThemeModule } from '../../@theme/theme.module';
+
+import { BootstrapRoutingModule } from './bootstrap-routing.module';
+import { ModalsComponent } from './modals/modals.component';
+import { ModalComponent } from './modals/modal/modal.component';
+import { BootstrapComponent } from './bootstrap.component';
+import { ButtonsModule } from './buttons/buttons.module';
+import { FormInputsComponent } from './form-inputs/form-inputs.component';
+
+const COMPONENTS = [
+  BootstrapComponent,
+  ModalsComponent,
+  ModalComponent,
+  FormInputsComponent,
+];
+
+const ENTRY_COMPONENTS = [
+  ModalComponent,
+];
+
+@NgModule({
+  imports: [
+    ThemeModule,
+    BootstrapRoutingModule,
+    ButtonsModule,
+  ],
+  declarations: [
+    ...COMPONENTS,
+  ],
+  entryComponents: [
+    ...ENTRY_COMPONENTS,
+  ],
+})
+export class BootstrapModule { }
diff --git a/src/app/pages/forms/buttons/block-level-buttons/block-level-buttons.component.html b/src/app/pages/bootstrap/buttons/block-level-buttons/block-level-buttons.component.html
similarity index 100%
rename from src/app/pages/forms/buttons/block-level-buttons/block-level-buttons.component.html
rename to src/app/pages/bootstrap/buttons/block-level-buttons/block-level-buttons.component.html
diff --git a/src/app/pages/forms/buttons/block-level-buttons/block-level-buttons.component.ts b/src/app/pages/bootstrap/buttons/block-level-buttons/block-level-buttons.component.ts
similarity index 100%
rename from src/app/pages/forms/buttons/block-level-buttons/block-level-buttons.component.ts
rename to src/app/pages/bootstrap/buttons/block-level-buttons/block-level-buttons.component.ts
diff --git a/src/app/pages/forms/buttons/button-groups/button-groups.component.html b/src/app/pages/bootstrap/buttons/button-groups/button-groups.component.html
similarity index 100%
rename from src/app/pages/forms/buttons/button-groups/button-groups.component.html
rename to src/app/pages/bootstrap/buttons/button-groups/button-groups.component.html
diff --git a/src/app/pages/forms/buttons/button-groups/button-groups.component.scss b/src/app/pages/bootstrap/buttons/button-groups/button-groups.component.scss
similarity index 100%
rename from src/app/pages/forms/buttons/button-groups/button-groups.component.scss
rename to src/app/pages/bootstrap/buttons/button-groups/button-groups.component.scss
diff --git a/src/app/pages/forms/buttons/button-groups/button-groups.component.ts b/src/app/pages/bootstrap/buttons/button-groups/button-groups.component.ts
similarity index 100%
rename from src/app/pages/forms/buttons/button-groups/button-groups.component.ts
rename to src/app/pages/bootstrap/buttons/button-groups/button-groups.component.ts
diff --git a/src/app/pages/bootstrap/buttons/buttons.component.html b/src/app/pages/bootstrap/buttons/buttons.component.html
new file mode 100644
index 0000000000..9a8d7ebd0d
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/buttons.component.html
@@ -0,0 +1,23 @@
+<div class="row">
+  <div class="col-lg-12">
+    <ngx-hero-buttons></ngx-hero-buttons>
+  </div>
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <ngx-shape-buttons></ngx-shape-buttons>
+
+    <div class="row">
+      <div class="col-lg-5">
+        <ngx-dropdown-buttons></ngx-dropdown-buttons>
+        <ngx-icon-buttons></ngx-icon-buttons>
+      </div>
+      <div class="col-lg-7">
+        <ngx-button-groups></ngx-button-groups>
+      </div>
+    </div>
+  </div>
+  <div class="col-md-12 col-lg-12 col-xxxl-6">
+    <ngx-size-buttons></ngx-size-buttons>
+    <ngx-default-buttons></ngx-default-buttons>
+    <ngx-block-level-buttons></ngx-block-level-buttons>
+  </div>
+</div>
diff --git a/src/app/pages/bootstrap/buttons/buttons.component.scss b/src/app/pages/bootstrap/buttons/buttons.component.scss
new file mode 100644
index 0000000000..c972d13f9a
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/buttons.component.scss
@@ -0,0 +1,103 @@
+@import '../../../@theme/styles/themes';
+@import '~@nebular/bootstrap/styles/buttons';
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/breakpoints';
+
+@include nb-install-component() {
+  /deep/ {
+    $button-size: 50px;
+
+    .container-title {
+      color: nb-theme(color-fg);
+      font-family: nb-theme(font-secondary);
+      margin-bottom: 0.5rem;
+    }
+
+    .header {
+      color: nb-theme(color-fg-header);
+      font-size: 0.875rem;
+    }
+
+    .subheader {
+      font-size: 0.75rem;
+      font-weight: nb-theme(font-weight-light);
+      color: nb-theme(color-fg);
+    }
+
+    .btn-demo {
+      width: 180px;
+    }
+
+    .state-container {
+      display: flex;
+
+      &:not(:last-child) {
+        margin-bottom: 1rem;
+      }
+
+      .state-value {
+        width: $button-size;
+        height: $button-size;
+        border-radius: nb-theme(btn-border-radius);
+
+        @include nb-for-theme(corporate) {
+          border-radius: nb-theme(btn-semi-round-border-radius);
+        }
+      }
+
+      .state-details {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        margin-left: 1rem;
+        margin-right: 1rem;
+        height: $button-size;
+      }
+    }
+
+    .example-container {
+      @include nb-ltr(padding-right, 0);
+      @include nb-rtl(padding-left, 0);
+    }
+
+    .example-container .container-btn {
+      margin-bottom: 1.5rem;
+    }
+
+    .block-level-buttons .btn-group {
+      margin-bottom: 1rem;
+    }
+  }
+
+  @include media-breakpoint-down(is) {
+    ngx-default-buttons /deep/ nb-card-header {
+      flex-direction: column;
+      align-items: left;
+
+      span {
+        margin-bottom: 1rem;
+      }
+    }
+  }
+
+  @include media-breakpoint-down(xs) {
+
+    /deep/.icon-buttons .icon-button-examples {
+      button {
+        @include nb-ltr(margin-right, 1rem);
+        @include nb-rtl(margin-left, 1rem);
+      }
+    }
+
+    ngx-default-buttons /deep/ nb-card-header {
+      flex-direction: column;
+      margin-bottom: 0.5rem;
+    }
+
+    ngx-block-level-buttons /deep/ {
+      .btn-primary {
+        padding: 0.75rem 1rem;
+      }
+    }
+  }
+}
diff --git a/src/app/pages/bootstrap/buttons/buttons.component.ts b/src/app/pages/bootstrap/buttons/buttons.component.ts
new file mode 100644
index 0000000000..c632c86983
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/buttons.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-buttons',
+  styleUrls: ['./buttons.component.scss'],
+  templateUrl: './buttons.component.html',
+})
+export class ButtonsComponent {
+}
diff --git a/src/app/pages/bootstrap/buttons/buttons.module.ts b/src/app/pages/bootstrap/buttons/buttons.module.ts
new file mode 100644
index 0000000000..a56930070f
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/buttons.module.ts
@@ -0,0 +1,38 @@
+import { NgModule } from '@angular/core';
+
+import { ThemeModule } from '../../../@theme/theme.module';
+import { DefaultButtonsComponent } from './default-buttons/default-buttons.component';
+import { HeroButtonComponent } from './hero-buttons/hero-buttons.component';
+import { ShapeButtonsComponent } from './shape-buttons/shape-buttons.component';
+import { SizeButtonsComponent } from './size-buttons/size-buttons.component';
+import { ButtonsComponent } from './buttons.component';
+import { DropdownButtonsComponent } from './dropdown-buttons/dropdown-button.component';
+import { BlockLevelButtonsComponent } from './block-level-buttons/block-level-buttons.component';
+import { ButtonGroupsComponent } from './button-groups/button-groups.component';
+import { IconButtonsComponent } from './icon-buttons/icon-buttons.component';
+
+const components = [
+  ButtonsComponent,
+  DefaultButtonsComponent,
+  HeroButtonComponent,
+  ShapeButtonsComponent,
+  SizeButtonsComponent,
+  DropdownButtonsComponent,
+  BlockLevelButtonsComponent,
+  ButtonGroupsComponent,
+  IconButtonsComponent,
+];
+
+@NgModule({
+  imports: [
+    ThemeModule,
+  ],
+  exports: [
+    ...components,
+  ],
+  declarations: [
+    ...components,
+  ],
+  providers: [],
+})
+export class ButtonsModule { }
diff --git a/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.html b/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.html
new file mode 100644
index 0000000000..3346b9cd69
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.html
@@ -0,0 +1,48 @@
+<nb-card>
+  <nb-card-header>
+    <span>Default Buttons</span>
+    <div class="dropdown" ngbDropdown>
+      <button class="btn btn-primary" type="button" ngbDropdownToggle>
+        {{ selectedView.title }}
+      </button>
+      <ul class="dropdown-menu" ngbDropdownMenu>
+        <li class="dropdown-item" *ngFor="let v of buttonsViews" (click)="this.selectedView = v">{{ v.title }}</li>
+      </ul>
+    </div>
+  </nb-card-header>
+  <nb-card-body>
+    <div class="row">
+      <div class="example-container col-md-4" *ngFor="let b of buttons[selectedView.key]">
+        <div class="container-title">
+          <span>{{ b.containerTitle }}</span>
+        </div>
+        <div class="container-btn">
+          <button class="btn {{ b.class }} btn-demo">{{ b.title }}</button>
+        </div>
+        <div class="{{ b.container }}">
+          <div class="state-container">
+            <div class="state-value original"></div>
+            <div class="state-details">
+              <span class="header">Default</span>
+              <span class="subheader">{{ b.default }}</span>
+            </div>
+          </div>
+          <div class="state-container">
+            <div class="state-value hover"></div>
+            <div class="state-details">
+              <span class="header">Hover</span>
+              <span class="subheader">14% white</span>
+            </div>
+          </div>
+          <div class="state-container">
+            <div class="state-value active"></div>
+            <div class="state-details">
+              <span class="header">Active</span>
+              <span class="subheader">14% black</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.scss b/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.scss
new file mode 100644
index 0000000000..febd14106a
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.scss
@@ -0,0 +1,126 @@
+@import '../../../../@theme/styles/themes';
+@import '~@nebular/bootstrap/styles/buttons';
+
+@include nb-install-component() {
+
+  nb-card-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .dropdown {
+      flex-basis: 30%;
+      min-width: 220px;
+    }
+  }
+
+  nb-card-body {
+    padding-bottom: 0;
+  }
+
+  .example-container {
+    margin-bottom: 1.5rem;
+  }
+
+  .primary-container {
+    .original {
+      background-color: nb-theme(btn-primary-bg);
+    }
+    .hover {
+      @include btn-primary-hover();
+    }
+    .active {
+      @include btn-primary-active();
+    }
+  }
+
+  .primary-container.outline .original {
+    background-color: transparent;
+    border: 2px solid nb-theme(btn-primary-bg);
+  }
+
+  .success-container {
+    .original {
+      background-color: nb-theme(btn-success-bg);
+    }
+    .hover {
+      @include btn-success-hover();
+    }
+    .active {
+      @include btn-success-active();
+    }
+  }
+
+  .success-container.outline .original {
+    background-color: transparent;
+    border: 2px solid nb-theme(btn-success-bg);
+  }
+
+  .warning-container {
+    .original {
+      background-color: nb-theme(btn-warning-bg);
+    }
+    .hover {
+      @include btn-warning-hover();
+    }
+    .active {
+      @include btn-warning-active();
+    }
+  }
+
+  .warning-container.outline .original {
+    background-color: transparent;
+    border: 2px solid nb-theme(btn-warning-bg);
+  }
+
+  .info-container {
+    .original {
+      background-color: nb-theme(btn-info-bg);
+    }
+    .hover {
+      @include btn-info-hover();
+    }
+    .active {
+      @include btn-info-active();
+    }
+  }
+
+  .info-container.outline .original {
+    background-color: transparent;
+    border: 2px solid nb-theme(btn-info-bg);
+  }
+
+  .danger-container {
+    .original {
+      background-color: nb-theme(btn-danger-bg);
+    }
+    .hover {
+      @include btn-danger-hover();
+    }
+    .active {
+      @include btn-danger-active();
+    }
+  }
+
+  .danger-container.outline .original {
+    background-color: transparent;
+    border: 2px solid nb-theme(btn-danger-bg);
+  }
+
+  .secondary-container {
+    .original {
+      border: 2px solid nb-theme(btn-secondary-border);
+    }
+    .hover {
+      @include btn-secondary-hover();
+    }
+    .active {
+      @include btn-secondary-active();
+    }
+  }
+
+  .secondary-container.outline .original {
+    background-color: transparent;
+    border: 2px solid nb-theme(btn-secondary-border);
+  }
+}
diff --git a/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.ts b/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.ts
new file mode 100644
index 0000000000..af7b7078d1
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.ts
@@ -0,0 +1,101 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-default-buttons',
+  styleUrls: ['./default-buttons.component.scss'],
+  templateUrl: './default-buttons.component.html',
+})
+export class DefaultButtonsComponent {
+
+  buttonsViews = [{
+    title: 'Default Buttons',
+    key: 'default',
+  }, {
+    title: 'Outline Buttons',
+    key: 'outline',
+  }];
+
+  selectedView = this.buttonsViews[0];
+
+  buttons = {
+    'default': [
+      {
+        class: 'btn-primary',
+        container: 'primary-container',
+        containerTitle: 'Primary Button',
+        title: 'Primary',
+        default: '#7659ff',
+      }, {
+        class: 'btn-warning',
+        container: 'warning-container',
+        containerTitle: 'Warning Button',
+        title: 'Warning',
+        default: '#ffcb17',
+      }, {
+        class: 'btn-success',
+        container: 'success-container',
+        containerTitle: 'Success Button',
+        title: 'Success',
+        default: '#00d977',
+      }, {
+        class: 'btn-info',
+        container: 'info-container',
+        containerTitle: 'Info Button',
+        title: 'Info',
+        default: '#0088ff',
+      }, {
+        class: 'btn-danger',
+        container: 'danger-container',
+        containerTitle: 'Danger Button',
+        title: 'Danger',
+        default: '#ff386a',
+      }, {
+        class: 'btn-secondary',
+        container: 'secondary-container',
+        containerTitle: 'Default Button',
+        title: 'Default',
+        default: '#bdbaff',
+      },
+    ],
+
+    'outline': [
+      {
+        class: 'btn-outline-primary',
+        container: 'primary-container outline',
+        containerTitle: 'Primary Button',
+        title: 'Primary',
+        default: '#7659ff',
+      }, {
+        class: 'btn-outline-warning',
+        container: 'warning-container outline',
+        containerTitle: 'Warning Button',
+        title: 'Warning',
+        default: '#ffcb17',
+      }, {
+        class: 'btn-outline-success',
+        container: 'success-container outline',
+        containerTitle: 'Success Button',
+        title: 'Success',
+        default: '#00d977',
+      }, {
+        class: 'btn-outline-info',
+        container: 'info-container',
+        containerTitle: 'Info Button',
+        title: 'Info',
+        default: '#0088ff',
+      }, {
+        class: 'btn-outline-danger',
+        container: 'danger-container outline',
+        containerTitle: 'Danger Button',
+        title: 'Danger',
+        default: '#ff386a',
+      }, {
+        class: 'btn-outline-secondary',
+        container: 'secondary-container outline',
+        containerTitle: 'Default Button',
+        title: 'Default',
+        default: '#bdbaff',
+      },
+    ],
+  };
+}
diff --git a/src/app/pages/forms/buttons/dropdown-buttons/dropdown-button.component.html b/src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.html
similarity index 100%
rename from src/app/pages/forms/buttons/dropdown-buttons/dropdown-button.component.html
rename to src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.html
diff --git a/src/app/pages/forms/buttons/dropdown-buttons/dropdown-button.component.scss b/src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.scss
similarity index 100%
rename from src/app/pages/forms/buttons/dropdown-buttons/dropdown-button.component.scss
rename to src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.scss
diff --git a/src/app/pages/forms/buttons/dropdown-buttons/dropdown-button.component.ts b/src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.ts
similarity index 100%
rename from src/app/pages/forms/buttons/dropdown-buttons/dropdown-button.component.ts
rename to src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.ts
diff --git a/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.html b/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.html
new file mode 100644
index 0000000000..ff39ea39ac
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.html
@@ -0,0 +1,72 @@
+<nb-card>
+  <nb-card-header>Hero Buttons</nb-card-header>
+  <nb-card-body>
+    <div class="row">
+      <div class="example-container col-sm-6 col-md-4 col-xl-3 col-xxxl-2" *ngFor="let hb of settings">
+        <div class="container-title">
+          <span>{{ hb.title }}</span>
+        </div>
+        <div class="container-btn">
+          <button class="btn {{ hb.class }} btn-demo">{{ hb.buttonTitle }}</button>
+        </div>
+        <div class="{{ hb.container }}">
+          <div class="state-container" *ngIf="hb[themeName].border">
+            <div class="state-value border"></div>
+            <div class="state-details">
+              <span class="header">Border</span>
+              <span class="subheader">{{ hb[themeName].border }}</span>
+            </div>
+          </div>
+          <div class="state-container" *ngIf="hb[themeName].color">
+            <div class="state-value color"></div>
+            <div class="state-details">
+              <span class="header">Color</span>
+              <span class="subheader">{{ hb[themeName].color }}</span>
+            </div>
+          </div>
+          <div class="state-container" *ngIf="hb[themeName].gradientLeft">
+            <div class="state-value gradient"></div>
+            <div class="state-details">
+              <span class="header">Linear Gradient</span>
+              <span class="subheader">{{ hb[themeName].gradientLeft }}</span>
+              <span class="subheader">{{ hb[themeName].gradientRight }}</span>
+            </div>
+          </div>
+          <div class="state-container">
+            <div class="state-value bevel" [ngClass]="{ 'none': !hb[themeName].bevel }"></div>
+            <div class="state-details" *ngIf="hb[themeName].bevel">
+              <span class="header">Bevel</span>
+              <span class="subheader">0 3px 0 0</span>
+              <span class="subheader">{{ hb[themeName].bevel }}</span>
+            </div>
+            <div class="state-details" *ngIf="!hb[themeName].bevel">
+              <span class="header">No Bevel</span>
+            </div>
+          </div>
+          <div class="state-container">
+            <div class="state-value shadow" [ngClass]="{ 'none': !hb[themeName].shadow }"></div>
+            <div class="state-details" *ngIf="hb[themeName].shadow">
+              <span class="header">Shadow</span>
+              <span class="subheader">0 4px 10px 0</span>
+              <span class="subheader">{{ hb[themeName].shadow }}</span>
+            </div>
+            <div class="state-details" *ngIf="!hb[themeName].shadow">
+              <span class="header">No Shadow</span>
+            </div>
+          </div>
+          <div class="state-container">
+            <div class="state-value glow" [ngClass]="{ 'none': !hb[themeName].glow }"></div>
+            <div class="state-details" *ngIf="hb[themeName].glow">
+              <span class="header">Glow</span>
+              <span class="subheader">{{ hb[themeName].glow.params }}</span>
+              <span class="subheader">{{ hb[themeName].glow.color }}</span>
+            </div>
+            <div class="state-details" *ngIf="!hb[themeName].glow">
+              <span class="header">No Glow</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.scss b/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.scss
new file mode 100644
index 0000000000..d2e3cfde48
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.scss
@@ -0,0 +1,135 @@
+@import '../../../../@theme/styles/themes';
+@import '~@nebular/bootstrap/styles/buttons';
+
+@include nb-install-component() {
+
+  nb-card-body {
+    padding-bottom: 0;
+  }
+
+  .none {
+    position: relative;
+    transform: rotate(45deg);
+
+    &::before, &::after {
+      position: absolute;
+      content: '';
+      background: nb-theme(form-control-border-color);
+    }
+
+    &::before {
+      left: 50%;
+      top: 10%;
+      transform: translateX(-50%);
+      width: 1px;
+      height: 80%;
+    }
+
+    &::after {
+      top: 50%;
+      left: 10%;
+      transform: translateY(-50%);
+      height: 1px;
+      width: 80%;
+    }
+  }
+
+  .shadow {
+    box-shadow: nb-theme(btn-hero-shadow);
+  }
+
+  .primary-container {
+    .color {
+      background-color: nb-theme(color-primary);
+    }
+    .gradient {
+      @include btn-hero-primary-gradient();
+    }
+    .glow {
+      box-shadow: btn-hero-primary-glow();
+    }
+    .bevel {
+      box-shadow: btn-hero-primary-bevel();
+    }
+  }
+
+  .warning-container {
+    .color {
+      background-color: nb-theme(color-warning);
+    }
+    .gradient {
+      @include btn-hero-warning-gradient();
+    }
+    .glow {
+      box-shadow: btn-hero-warning-glow();
+    }
+    .bevel {
+      box-shadow: btn-hero-warning-bevel();
+    }
+  }
+
+  .success-container {
+    .color {
+      background-color: nb-theme(color-success);
+    }
+    .gradient {
+      @include btn-hero-success-gradient();
+    }
+    .glow {
+      box-shadow: btn-hero-success-glow();
+    }
+    .bevel {
+      box-shadow: btn-hero-success-bevel();
+    }
+  }
+
+  .info-container {
+    .color {
+      background-color: nb-theme(color-info);
+    }
+    .gradient {
+      @include btn-hero-info-gradient();
+    }
+    .glow {
+      box-shadow: btn-hero-info-glow();
+    }
+    .bevel {
+      box-shadow: btn-hero-info-bevel();
+    }
+  }
+
+  .danger-container {
+    .color {
+      background-color: nb-theme(color-danger);
+    }
+    .gradient {
+      @include btn-hero-danger-gradient();
+    }
+    .glow {
+      box-shadow: btn-hero-danger-glow();
+    }
+    .bevel {
+      box-shadow: btn-hero-danger-bevel();
+    }
+  }
+
+  .secondary-container {
+    .color {
+      background-color: nb-theme(btn-secondary-bg);
+    }
+    .border {
+      color: nb-theme(btn-secondary-color);
+      border: nb-theme(btn-secondary-border-width) solid nb-theme(btn-secondary-border);
+    }
+    .glow {
+      box-shadow: btn-hero-secondary-glow();
+    }
+    .bevel {
+      box-shadow: btn-hero-secondary-bevel();
+    }
+  }
+
+  .example-container {
+    margin-bottom: 1.5rem;
+  }
+}
diff --git a/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.ts b/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.ts
new file mode 100644
index 0000000000..c0c22cae73
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.ts
@@ -0,0 +1,180 @@
+import { Component, OnDestroy } from '@angular/core';
+import { NbThemeService } from '@nebular/theme';
+import { Subscription } from 'rxjs';
+
+@Component({
+  selector: 'ngx-hero-buttons',
+  styleUrls: ['./hero-buttons.component.scss'],
+  templateUrl: './hero-buttons.component.html',
+})
+export class HeroButtonComponent implements OnDestroy {
+
+  themeName = 'default';
+  settings: Array<any>;
+  themeSubscription: Subscription;
+
+  constructor(private themeService: NbThemeService) {
+    this.themeSubscription = this.themeService.getJsTheme().subscribe(theme => {
+      this.themeName = theme.name;
+      this.init(theme.variables);
+    });
+  }
+
+  init(colors: any) {
+    this.settings = [{
+      class: 'btn-hero-primary',
+      container: 'primary-container',
+      title: 'Primary Button',
+      buttonTitle: 'Primary',
+      default: {
+        gradientLeft: `adjust-hue(${colors.primary}, 20deg)`,
+        gradientRight: colors.primary,
+      },
+      corporate: {
+        color: colors.primary,
+        glow: {
+          params: '0 0 20px 0',
+          color: 'rgba (115, 161, 255, 0.5)',
+        },
+      },
+      cosmic: {
+        gradientLeft: `adjust-hue(${colors.primary}, 20deg)`,
+        gradientRight: colors.primary,
+        bevel: `shade(${colors.primary}, 14%)`,
+        shadow: 'rgba (6, 7, 64, 0.5)',
+        glow: {
+          params: '0 2px 12px 0',
+          color: `adjust-hue(${colors.primary}, 10deg)`,
+        },
+      },
+    }, {
+      class: 'btn-hero-warning',
+      container: 'warning-container',
+      title: 'Warning Button',
+      buttonTitle: 'Warning',
+      default: {
+        gradientLeft: `adjust-hue(${colors.warning}, 10deg)`,
+        gradientRight: colors.warning,
+      },
+      corporate: {
+        color: colors.warning,
+        glow: {
+          params: '0 0 20px 0',
+          color: 'rgba (256, 163, 107, 0.5)',
+        },
+      },
+      cosmic: {
+        gradientLeft: `adjust-hue(${colors.warning}, 10deg)`,
+        gradientRight: colors.warning,
+        bevel: `shade(${colors.warning}, 14%)`,
+        shadow: 'rgba (33, 7, 77, 0.5)',
+        glow: {
+          params: '0 2px 12px 0',
+          color: `adjust-hue(${colors.warning}, 5deg)`,
+        },
+      },
+    }, {
+      class: 'btn-hero-success',
+      container: 'success-container',
+      title: 'Success Button',
+      buttonTitle: 'Success',
+      default: {
+        gradientLeft: `adjust-hue(${colors.success}, 20deg)`,
+        gradientRight: colors.success,
+      },
+      corporate: {
+        color: colors.success,
+        glow: {
+          params: '0 0 20px 0',
+          color: 'rgba (93, 207, 227, 0.5)',
+        },
+      },
+      cosmic: {
+        gradientLeft: `adjust-hue(${colors.success}, 20deg)`,
+        gradientRight: colors.success,
+        bevel: `shade(${colors.success}, 14%)`,
+        shadow: 'rgba (33, 7, 77, 0.5)',
+        glow: {
+          params: '0 2px 12px 0',
+          color: `adjust-hue(${colors.success}, 10deg)`,
+        },
+      },
+    }, {
+      class: 'btn-hero-info',
+      container: 'info-container',
+      title: 'Info Button',
+      buttonTitle: 'Info',
+      default: {
+        gradientLeft: `adjust-hue(${colors.info}, -10deg)`,
+        gradientRight: colors.info,
+      },
+      corporate: {
+        color: colors.info,
+        glow: {
+          params: '0 0 20px 0',
+          color: 'rgba (186, 127, 236, 0.5)',
+        },
+      },
+      cosmic: {
+        gradientLeft: `adjust-hue(${colors.info}, -10deg)`,
+        gradientRight: colors.info,
+        bevel: `shade(${colors.info}, 14%)`,
+        shadow: 'rgba (33, 7, 77, 0.5)',
+        glow: {
+          params: '0 2px 12px 0',
+          color: `adjust-hue(${colors.info}, -5deg)`,
+        },
+      },
+    }, {
+      class: 'btn-hero-danger',
+      container: 'danger-container',
+      title: 'Danger Button',
+      buttonTitle: 'Danger',
+      default: {
+        gradientLeft: `adjust-hue(${colors.danger}, -20deg)`,
+        gradientRight: colors.danger,
+      },
+      corporate: {
+        color: colors.danger,
+        glow: {
+          params: '0 0 20px 0',
+          color: 'rgba (255, 107, 131, 0.5)',
+        },
+      },
+      cosmic: {
+        gradientLeft: `adjust-hue(${colors.danger}, -20deg)`,
+        gradientRight: colors.danger,
+        bevel: `shade(${colors.danger}, 14%)`,
+        shadow: 'rgba (33, 7, 77, 0.5)',
+        glow: {
+          params: '0 2px 12px 0',
+          color: `adjust-hue(${colors.danger}, -10deg)`,
+        },
+      },
+    }, {
+      class: 'btn-hero-secondary',
+      container: 'secondary-container',
+      title: 'Ghost Button',
+      buttonTitle: 'Ghost',
+      default: {
+        border: '#dadfe6',
+      },
+      corporate: {
+        color: '#edf2f5',
+      },
+      cosmic: {
+        border: colors.primary,
+        bevel: '#665ebd',
+        shadow: 'rgba (33, 7, 77, 0.5)',
+        glow: {
+          params: '0 2px 12px 0',
+          color: 'rgba (146, 141, 255, 1)',
+        },
+      },
+    }];
+  }
+
+  ngOnDestroy() {
+    this.themeSubscription.unsubscribe();
+  }
+}
diff --git a/src/app/pages/forms/buttons/icon-buttons/icon-buttons.component.html b/src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.html
similarity index 100%
rename from src/app/pages/forms/buttons/icon-buttons/icon-buttons.component.html
rename to src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.html
diff --git a/src/app/pages/forms/buttons/icon-buttons/icon-buttons.component.scss b/src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.scss
similarity index 100%
rename from src/app/pages/forms/buttons/icon-buttons/icon-buttons.component.scss
rename to src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.scss
diff --git a/src/app/pages/forms/buttons/icon-buttons/icon-buttons.component.ts b/src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.ts
similarity index 100%
rename from src/app/pages/forms/buttons/icon-buttons/icon-buttons.component.ts
rename to src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.ts
diff --git a/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.html b/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.html
new file mode 100644
index 0000000000..814c85fc3c
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.html
@@ -0,0 +1,43 @@
+<nb-card>
+  <nb-card-header>Button Shapes</nb-card-header>
+  <nb-card-body>
+    <div class="shape-container">
+      <div class="container-title">
+        <span>Rectangle Button</span>
+      </div>
+      <div class="subheader">
+        <span>Border radius:</span>
+        <span>4px</span>
+      </div>
+      <div>
+        <button class="btn btn-success btn-rectangle btn-demo">Rectangle</button>
+      </div>
+    </div>
+
+    <div class="shape-container">
+      <div class="container-title">
+        <span>Semi-round Button</span>
+      </div>
+      <div class="subheader">
+        <span>Border radius:</span>
+        <span>12px</span>
+      </div>
+      <div>
+        <button class="btn btn-success btn-semi-round btn-demo">Semi-round</button>
+      </div>
+    </div>
+
+    <div class="shape-container">
+      <div class="container-title">
+        <span>Rounded Button</span>
+      </div>
+      <div class="subheader">
+        <span>Border radius:</span>
+        <span>round</span>
+      </div>
+      <div>
+        <button class="btn btn-success btn-round btn-demo">Round</button>
+      </div>
+    </div>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.scss b/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.scss
new file mode 100644
index 0000000000..996e682166
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.scss
@@ -0,0 +1,30 @@
+@import '../../../../@theme/styles/themes';
+@import '~@nebular/bootstrap/styles/buttons';
+
+@include nb-install-component() {
+
+  nb-card-body {
+    padding: 0 0 29px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+  }
+
+  .shape-container {
+    margin: 1.25rem 1.25rem 0;
+  }
+
+  .container-title {
+    margin-bottom: 0.25rem;
+  }
+
+  .subheader {
+    margin-bottom: 1rem;
+    font-size: 0.875rem;
+
+    span:nth-child(2) {
+      color: nb-theme(color-fg-heading);
+      font-weight: nb-theme(font-weight-bold);
+    }
+  }
+}
diff --git a/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.ts b/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.ts
new file mode 100644
index 0000000000..dde928d8ba
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-shape-buttons',
+  styleUrls: ['./shape-buttons.component.scss'],
+  templateUrl: './shape-buttons.component.html',
+})
+export class ShapeButtonsComponent {
+}
diff --git a/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.html b/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.html
new file mode 100644
index 0000000000..dda2e2a76a
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.html
@@ -0,0 +1,50 @@
+<nb-card>
+  <nb-card-header>Button Sizes</nb-card-header>
+
+  <nb-card-body>
+    <div class="size-container">
+      <div class="container-title">
+        <span>Large Button</span>
+      </div>
+      <div class="subheader">
+        <span>0.875rem 1.75rem</span>
+      </div>
+      <div>
+        <button class="btn btn-primary btn-lg">Large Button</button>
+      </div>
+    </div>
+    <div class="size-container">
+      <div class="container-title">
+        <span>Medium Button</span>
+      </div>
+      <div class="subheader">
+        <span>0.75rem 1.5rem</span>
+      </div>
+      <div>
+        <button class="btn btn-primary btn-md">Medium Button</button>
+      </div>
+    </div>
+    <div class="size-container">
+      <div class="container-title">
+        <span>Small Button</span>
+      </div>
+      <div class="subheader">
+        <span>0.675rem 1.5rem</span>
+      </div>
+      <div>
+        <button class="btn btn-primary btn-sm">Small Button</button>
+      </div>
+    </div>
+    <div class="size-container">
+      <div class="container-title">
+        <span>X-Small Button</span>
+      </div>
+      <div class="subheader">
+        <span>0.5rem 1.25rem</span>
+      </div>
+      <div>
+        <button class="btn btn-primary btn-xs">X-Small Button</button>
+      </div>
+    </div>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.scss b/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.scss
new file mode 100644
index 0000000000..67d7ae288d
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.scss
@@ -0,0 +1,26 @@
+@import '../../../../@theme/styles/themes';
+@import '~@nebular/bootstrap/styles/buttons';
+
+@include nb-install-component() {
+
+  nb-card-body {
+    padding: 0 1.25rem 1.25rem 0;
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+  .container-title {
+    margin-bottom: 0.25rem;
+  }
+
+  .size-container {
+    margin: 1.25rem 0 0 1.25rem;
+  }
+
+  .subheader {
+    margin-bottom: 0.75rem;
+    font-size: 0.875rem;
+    font-weight: nb-theme(font-weight-bolder);
+    color: nb-theme(color-fg-heading);
+  }
+}
diff --git a/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.ts b/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.ts
new file mode 100644
index 0000000000..bdc9bb3391
--- /dev/null
+++ b/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-size-buttons',
+  styleUrls: ['./size-buttons.component.scss'],
+  templateUrl: './size-buttons.component.html',
+})
+export class SizeButtonsComponent {
+}
diff --git a/src/app/pages/bootstrap/form-inputs/form-inputs.component.html b/src/app/pages/bootstrap/form-inputs/form-inputs.component.html
new file mode 100644
index 0000000000..6331c2b7c5
--- /dev/null
+++ b/src/app/pages/bootstrap/form-inputs/form-inputs.component.html
@@ -0,0 +1,235 @@
+<div class="row">
+  <div class="col-lg-6">
+    <nb-card>
+      <nb-card-header>Default Inputs</nb-card-header>
+      <nb-card-body>
+        <div class="input-group">
+          <input type="text" placeholder="Project" class="form-control"/>
+        </div>
+        <div class="row full-name-inputs">
+          <div class="col-sm-6 input-group">
+            <input type="text" placeholder="Nick" class="form-control"/>
+          </div>
+          <div class="col-sm-6 input-group">
+            <input type="text" placeholder="Last Name" class="form-control"/>
+          </div>
+        </div>
+        <div class="input-group">
+          <input type="password" placeholder="Password" class="form-control"/>
+        </div>
+        <div class="input-group has-person-icon">
+          <input type="text" placeholder="With Icon" class="form-control"/>
+        </div>
+        <div class="input-group input-group-rounded">
+          <input type="text" placeholder="Rounded border" class="form-control"/>
+        </div>
+        <div class="form-group">
+          <input type="text" placeholder="Project" class="form-control"/>
+          <small class="form-text">A block of help text that breaks into a new line and may extend beyond one line.
+          </small>
+        </div>
+        <div class="input-group">
+          <input type="text" placeholder="Disabled input" class="form-control" disabled/>
+        </div>
+        <div class="input-group">
+          <textarea rows="5" placeholder="Text Area" class="form-control"></textarea>
+        </div>
+        <div class="input-group input-group-sm">
+          <input type="text" placeholder="Small Input" class="form-control"/>
+        </div>
+        <div class="input-group input-group-lg">
+          <input type="text" placeholder="Large Input" class="form-control"/>
+        </div>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-card>
+      <nb-card-header>Input Groups</nb-card-header>
+      <nb-card-body>
+        <div class="input-group">
+          <span class="input-group-addon success">@</span>
+          <input type="text" class="form-control" placeholder="Username"/>
+        </div>
+
+        <div class="input-group mail-btn-group">
+          <span class="input-group-prepend">
+            <button class="btn btn-primary btn-icon input-group-text">
+              <i class="ion-ios-email-outline"></i>
+            </button>
+          </span>
+          <input type="text" class="form-control" placeholder="Recipient's username">
+          <span class="input-group-append">
+            <button class="btn btn-primary input-group-text">
+              @example.com
+            </button>
+          </span>
+        </div>
+        <div class="input-group">
+          <input type="text" class="form-control" placeholder="Search for...">
+          <span class="input-group-append">
+            <button class="btn btn-danger input-group-text">
+              Search
+            </button>
+          </span>
+        </div>
+        <div class="input-group">
+          <div class="dropdown input-group-prepend input-group-btn" ngbDropdown>
+            <button type="button" class="btn btn-success dropdown-toggle" ngbDropdownToggle>
+              Action
+            </button>
+            <ul class="dropdown-menu" ngbDropdownMenu>
+              <li class="dropdown-item">Action</li>
+              <li class="dropdown-item">Another action</li>
+              <li class="dropdown-item">Something else here</li>
+              <div role="separator" class="dropdown-divider"></div>
+              <li class="dropdown-item">Separated link</li>
+            </ul>
+          </div>
+          <input type="text" class="form-control">
+        </div>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-card>
+      <nb-card-header>Selects</nb-card-header>
+      <nb-card-body>
+        <div class="form-group">
+          <label>Simple Select</label>
+          <select class="form-control">
+            <option>Minsk</option>
+            <option>Gomel</option>
+            <option>Brest</option>
+            <option>Grodno</option>
+            <option>Mogilev</option>
+          </select>
+        </div>
+        <div class="form-group">
+          <label>Multiple Select</label>
+          <select multiple class="form-control">
+            <option>Item 1</option>
+            <option>Item 2</option>
+            <option>Item 3</option>
+            <option>Item 4</option>
+            <option>Item 5</option>
+          </select>
+        </div>
+      </nb-card-body>
+    </nb-card>
+  </div>
+
+  <div class="col-lg-6">
+    <nb-card>
+      <nb-card-header>Input Styles</nb-card-header>
+      <nb-card-body>
+        <div class="input-group input-group-border-only">
+          <input type="text" placeholder="Border Only" class="form-control"/>
+        </div>
+        <div class="input-group">
+          <input type="text" placeholder="Default Input" class="form-control">
+        </div>
+        <div class="input-group input-group-fill-only">
+          <input type="text" placeholder="Fill Only" class="form-control">
+        </div>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-card>
+      <nb-card-header>Validation States</nb-card-header>
+      <nb-card-body>
+        <div class="form-group">
+          <input type="text" placeholder="Input with Success" class="form-control form-control-success">
+        </div>
+        <div class="form-group">
+          <input type="text" placeholder="Input with Warning" class="form-control form-control-warning">
+        </div>
+        <div class="form-group">
+          <input type="text" placeholder="Input with Danger" class="form-control form-control-danger">
+        </div>
+        <div class="form-group validation-checkboxes row">
+          <nb-checkbox status="success" class="col-sm-4">Checkbox with Success</nb-checkbox>
+          <nb-checkbox status="warning" class="col-sm-4">Checkbox with Warning</nb-checkbox>
+          <nb-checkbox status="danger" class="col-sm-4">Checkbox with Danger</nb-checkbox>
+        </div>
+        <div class="form-group has-success">
+          <input type="text" placeholder="Input with Success Icon" class="form-control form-control-success">
+        </div>
+        <div class="form-group has-warning">
+          <input type="text" placeholder="Input with Warning Icon" class="form-control form-control-warning">
+        </div>
+        <div class="form-group has-danger">
+          <input type="text" placeholder="Input with Danger Icon" class="form-control form-control-danger">
+        </div>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-card>
+      <nb-card-header>Checkboxes & Radios</nb-card-header>
+      <nb-card-body>
+        <div class="row demo-checkboxes-radio">
+          <div class="demo-checkboxes col-sm-4">
+            <nb-checkbox>Checkbox 1</nb-checkbox>
+            <nb-checkbox [value]="true">Checkbox 2</nb-checkbox>
+
+            <div class="custom-control custom-checkbox">
+              <input type="checkbox" class="custom-control-input" id="b-checkbox">
+              <label class="custom-control-label" for="b-checkbox">Bootstrap Checkbox</label>
+            </div>
+          </div>
+          <div class="demo-radio col-sm-4">
+            <label class="custom-control custom-radio">
+              <input type="radio" class="custom-control-input" name="customRadio">
+              <span class="custom-control-indicator"></span>
+              <span class="custom-control-description">Radio 1</span>
+            </label>
+            <label class="custom-control custom-radio">
+              <input type="radio" class="custom-control-input" name="customRadio" checked>
+              <span class="custom-control-indicator"></span>
+              <span class="custom-control-description">Radio 2</span>
+            </label>
+            <label class="custom-control custom-radio">
+              <input type="radio" class="custom-control-input" name="customRadio">
+              <span class="custom-control-indicator"></span>
+              <span class="custom-control-description">Radio 3</span>
+            </label>
+          </div>
+          <div class="demo-disabled-checkbox-radio col-sm-4">
+            <nb-checkbox disabled>Disabled Checkbox</nb-checkbox>
+            <label class="custom-control custom-radio">
+              <input type="radio" class="custom-control-input" disabled>
+              <span class="custom-control-indicator"></span>
+              <span class="custom-control-description">Disabled Radio</span>
+            </label>
+          </div>
+        </div>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-card>
+      <nb-card-body class="demo-rating">
+        <span class="rating-header">Rating</span>
+        <div>
+          <ngb-rating [(rate)]="starRate" max=5>
+            <ng-template let-fill="fill">
+              <span class="star fill" [class.filled]="fill === 100">
+                <i class="ion-android-star" *ngIf="fill === 100"></i>
+                <i class="ion-android-star-outline" *ngIf="fill !== 100"></i>
+              </span>
+            </ng-template>
+          </ngb-rating>
+          <span class="current-rate">{{ starRate }}</span>
+        </div>
+        <div>
+          <ngb-rating [(rate)]="heartRate" max=5>
+            <ng-template let-fill="fill">
+              <span class="star fill" [class.filled]="fill === 100">
+                <i class="ion-ios-heart" *ngIf="fill === 100"></i>
+                <i class="ion-ios-heart-outline" *ngIf="fill !== 100"></i>
+              </span>
+            </ng-template>
+          </ngb-rating>
+          <span class="current-rate">{{ heartRate }}</span>
+        </div>
+      </nb-card-body>
+    </nb-card>
+  </div>
+</div>
diff --git a/src/app/pages/bootstrap/form-inputs/form-inputs.component.scss b/src/app/pages/bootstrap/form-inputs/form-inputs.component.scss
new file mode 100644
index 0000000000..763b31ae3f
--- /dev/null
+++ b/src/app/pages/bootstrap/form-inputs/form-inputs.component.scss
@@ -0,0 +1,130 @@
+@import '../../../@theme/styles/themes';
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/breakpoints';
+
+@include nb-install-component() {
+
+  nb-card-body {
+    overflow: visible;
+  }
+
+  .input-group {
+    margin-bottom: 1rem;
+  }
+
+  .validation-checkboxes {
+    display: flex;
+    justify-content: space-between;
+
+    .custom-control {
+      margin-left: 1rem;
+    }
+  }
+
+  .demo-checkboxes {
+    display: flex;
+    flex-direction: column;
+    margin-bottom: 1rem;
+  }
+
+  .demo-radio {
+    display: flex;
+    flex-direction: column;
+    margin-bottom: 1rem;
+  }
+
+  .demo-disabled-checkbox-radio {
+    display: flex;
+    flex-direction: column;
+    margin-bottom: 1rem;
+  }
+
+  .demo-checkboxes-radio {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .demo-rating {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+  }
+
+  .star {
+    font-size: 1.5rem;
+    color: nb-theme(color-fg);
+  }
+
+  .filled {
+    color: nb-theme(color-fg);
+  }
+
+  // TODO: Replace with the card header styles mixin
+  .rating-header {
+    line-height: 2rem;
+    font-size: 1.25rem;
+    font-family: nb-theme(font-secondary);
+    font-weight: nb-theme(font-weight-bolder);
+    color: nb-theme(color-fg-heading);
+  }
+
+  .current-rate {
+    font-size: 1.5rem;
+    @include nb-ltr(padding-left, 1rem);
+    @include nb-rtl(padding-right, 1rem);
+    color: nb-theme(color-fg-heading);
+  }
+
+  .full-name-inputs {
+    display: flex;
+  }
+
+  .input-group.has-person-icon {
+    position: relative;
+
+    .form-control {
+
+      padding-left: 3rem;
+    }
+
+    &::before {
+      content: '\F47D';
+      font-family: 'Ionicons';
+      font-size: 2rem;
+      position: absolute;
+      z-index: 100;
+      left: 1rem;
+      top: 0.25rem;
+    }
+  }
+
+  .dropdown {
+    min-width: 7rem;
+  }
+
+  .dropdown-menu {
+    width: auto;
+  }
+
+  .form-group label {
+    padding: 0 0 0.75rem;
+  }
+
+  ngb-rating {
+    outline: none;
+  }
+
+  ngb-rating i {
+    color: nb-theme(color-success);
+    @include nb-for-theme(cosmic) {
+      color: nb-theme(color-primary);
+    }
+  }
+
+  @include media-breakpoint-down(xs) {
+    button:not(.btn-icon) {
+      padding: 0.75rem 1rem;
+      font-size: 0.75rem;
+    }
+  }
+}
diff --git a/src/app/pages/bootstrap/form-inputs/form-inputs.component.ts b/src/app/pages/bootstrap/form-inputs/form-inputs.component.ts
new file mode 100644
index 0000000000..6299738fec
--- /dev/null
+++ b/src/app/pages/bootstrap/form-inputs/form-inputs.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-form-inputs',
+  styleUrls: ['./form-inputs.component.scss'],
+  templateUrl: './form-inputs.component.html',
+})
+export class FormInputsComponent {
+
+  starRate = 2;
+  heartRate = 4;
+}
diff --git a/src/app/pages/modal-overlays/modals/modal/modal.component.html b/src/app/pages/bootstrap/modals/modal/modal.component.html
similarity index 100%
rename from src/app/pages/modal-overlays/modals/modal/modal.component.html
rename to src/app/pages/bootstrap/modals/modal/modal.component.html
diff --git a/src/app/pages/modal-overlays/modals/modal/modal.component.ts b/src/app/pages/bootstrap/modals/modal/modal.component.ts
similarity index 100%
rename from src/app/pages/modal-overlays/modals/modal/modal.component.ts
rename to src/app/pages/bootstrap/modals/modal/modal.component.ts
diff --git a/src/app/pages/modal-overlays/modals/modals.component.html b/src/app/pages/bootstrap/modals/modals.component.html
similarity index 100%
rename from src/app/pages/modal-overlays/modals/modals.component.html
rename to src/app/pages/bootstrap/modals/modals.component.html
diff --git a/src/app/pages/modal-overlays/modals/modals.component.scss b/src/app/pages/bootstrap/modals/modals.component.scss
similarity index 100%
rename from src/app/pages/modal-overlays/modals/modals.component.scss
rename to src/app/pages/bootstrap/modals/modals.component.scss
diff --git a/src/app/pages/modal-overlays/modals/modals.component.ts b/src/app/pages/bootstrap/modals/modals.component.ts
similarity index 100%
rename from src/app/pages/modal-overlays/modals/modals.component.ts
rename to src/app/pages/bootstrap/modals/modals.component.ts
diff --git a/src/app/pages/forms/buttons/button-elements/button-elements.component.html b/src/app/pages/forms/buttons/button-elements/button-elements.component.html
new file mode 100644
index 0000000000..e8c50a73de
--- /dev/null
+++ b/src/app/pages/forms/buttons/button-elements/button-elements.component.html
@@ -0,0 +1,17 @@
+<nb-card>
+  <nb-card-header>Button Elements</nb-card-header>
+  <nb-card-body>
+    <div class="button-container">
+      <button (click)="onClick()" nbButton>Button</button>
+    </div>
+    <div class="button-container">
+      <input (click)="onClick()" nbButton type="submit" value="Input Submit"/>
+    </div>
+    <div class="button-container">
+      <input (click)="onClick()" nbButton type="button" value="Input Button"/>
+    </div>
+    <div class="button-container">
+      <a (click)="onClick()" href="#" nbButton>Link</a>
+    </div>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/forms/buttons/button-elements/button-elements.component.scss b/src/app/pages/forms/buttons/button-elements/button-elements.component.scss
new file mode 100644
index 0000000000..4a83e35393
--- /dev/null
+++ b/src/app/pages/forms/buttons/button-elements/button-elements.component.scss
@@ -0,0 +1,15 @@
+@import '../../../../@theme/styles/themes';
+@import '~@nebular/bootstrap/styles/buttons';
+
+@include nb-install-component() {
+
+  nb-card-body {
+    padding: 0 1.25rem 1.25rem 0;
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+  .button-container {
+    margin: 1.25rem 0 0 1.25rem;
+  }
+}
diff --git a/src/app/pages/forms/buttons/button-elements/button-elements.component.ts b/src/app/pages/forms/buttons/button-elements/button-elements.component.ts
new file mode 100644
index 0000000000..cb92b2e8cc
--- /dev/null
+++ b/src/app/pages/forms/buttons/button-elements/button-elements.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-button-elements',
+  styleUrls: ['./button-elements.component.scss'],
+  templateUrl: './button-elements.component.html',
+})
+export class ButtonElementsComponent {
+
+  onClick() {
+  }
+}
diff --git a/src/app/pages/forms/buttons/buttons.component.html b/src/app/pages/forms/buttons/buttons.component.html
index 336e89f1b8..881992904c 100644
--- a/src/app/pages/forms/buttons/buttons.component.html
+++ b/src/app/pages/forms/buttons/buttons.component.html
@@ -1,25 +1,16 @@
 <div class="row">
   <div class="col-lg-12">
     <ngx-hero-buttons></ngx-hero-buttons>
+    <ngx-default-buttons></ngx-default-buttons>
+    <ngx-outline-buttons></ngx-outline-buttons>
   </div>
   <div class="col-md-12 col-lg-12 col-xxxl-6">
     <ngx-shape-buttons></ngx-shape-buttons>
     <ngx-action-groups></ngx-action-groups>
     <ngx-labeled-actions-group></ngx-labeled-actions-group>
-
-    <div class="row">
-      <div class="col-lg-5">
-        <ngx-dropdown-buttons></ngx-dropdown-buttons>
-        <ngx-icon-buttons></ngx-icon-buttons>
-      </div>
-      <div class="col-lg-7">
-        <ngx-button-groups></ngx-button-groups>
-      </div>
-    </div>
   </div>
   <div class="col-md-12 col-lg-12 col-xxxl-6">
     <ngx-size-buttons></ngx-size-buttons>
-    <ngx-default-buttons></ngx-default-buttons>
-    <ngx-block-level-buttons></ngx-block-level-buttons>
+    <ngx-button-elements></ngx-button-elements>
   </div>
 </div>
diff --git a/src/app/pages/forms/buttons/buttons.module.ts b/src/app/pages/forms/buttons/buttons.module.ts
index ba34dc54b2..c1bc5488cc 100644
--- a/src/app/pages/forms/buttons/buttons.module.ts
+++ b/src/app/pages/forms/buttons/buttons.module.ts
@@ -7,24 +7,20 @@ import { ShapeButtonsComponent } from './shape-buttons/shape-buttons.component';
 import { SizeButtonsComponent } from './size-buttons/size-buttons.component';
 import { ButtonsComponent } from './buttons.component';
 import { ActionGroupsComponent } from './action-groups/action-groups.component';
-import { DropdownButtonsComponent } from './dropdown-buttons/dropdown-button.component';
-import { BlockLevelButtonsComponent } from './block-level-buttons/block-level-buttons.component';
-import { ButtonGroupsComponent } from './button-groups/button-groups.component';
-import { IconButtonsComponent } from './icon-buttons/icon-buttons.component';
 import { LabeledActionsGroupComponent } from './labeled-actions-group/labeled-actions-group.component';
+import { OutlineButtonsComponent } from './outline-buttons/outline-buttons.component';
+import { ButtonElementsComponent } from './button-elements/button-elements.component';
 
 const components = [
   ButtonsComponent,
   DefaultButtonsComponent,
+  OutlineButtonsComponent,
   HeroButtonComponent,
   ShapeButtonsComponent,
   SizeButtonsComponent,
   ActionGroupsComponent,
-  DropdownButtonsComponent,
-  BlockLevelButtonsComponent,
-  ButtonGroupsComponent,
-  IconButtonsComponent,
   LabeledActionsGroupComponent,
+  ButtonElementsComponent,
 ];
 
 @NgModule({
diff --git a/src/app/pages/forms/buttons/default-buttons/default-buttons.component.html b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.html
index 4c3c3b60cb..022e624ddc 100644
--- a/src/app/pages/forms/buttons/default-buttons/default-buttons.component.html
+++ b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.html
@@ -1,44 +1,19 @@
 <nb-card>
   <nb-card-header>
     <span>Default Buttons</span>
-    <div class="dropdown" ngbDropdown>
-      <button class="btn btn-primary" type="button" ngbDropdownToggle>
-        {{ selectedView.title }}
-      </button>
-      <ul class="dropdown-menu" ngbDropdownMenu>
-        <li class="dropdown-item" *ngFor="let v of buttonsViews" (click)="this.selectedView = v">{{ v.title }}</li>
-      </ul>
-    </div>
   </nb-card-header>
   <nb-card-body>
     <div class="row">
-      <div class="example-container col-md-4" *ngFor="let b of buttons[selectedView.key]">
+      <div class="example-container col-md-4" *ngFor="let b of buttons">
         <div class="container-title">
           <span>{{ b.containerTitle }}</span>
         </div>
         <div class="container-btn">
-          <button *ngIf="!b.bootstrap && !b.outline"
-                  nbButton
+          <button nbButton
                   status="{{ b.status }}"
                   class="btn-demo">
             {{ b.title }}
           </button>
-          <button *ngIf="b.bootstrap && !b.outline"
-                  class="btn {{ b.class }} btn-demo">
-            {{ b.title }}
-          </button>
-          <button *ngIf="!b.bootstrap && b.outline"
-                  nbButton
-                  outline
-                  status="{{ b.status }}"
-                  class="btn-demo">
-            {{ b.title }}
-          </button>
-          <button *ngIf="b.bootstrap && b.outline"
-                  outline
-                  class="btn {{ b.class }} btn-demo">
-            {{ b.title }}
-          </button>
         </div>
         <div class="{{ b.container }}">
           <div class="state-container">
diff --git a/src/app/pages/forms/buttons/default-buttons/default-buttons.component.scss b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.scss
index febd14106a..5ed3e93e32 100644
--- a/src/app/pages/forms/buttons/default-buttons/default-buttons.component.scss
+++ b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.scss
@@ -1,5 +1,7 @@
 @import '../../../../@theme/styles/themes';
 @import '~@nebular/bootstrap/styles/buttons';
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
 
@@ -7,11 +9,6 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-
-    .dropdown {
-      flex-basis: 30%;
-      min-width: 220px;
-    }
   }
 
   nb-card-body {
@@ -123,4 +120,11 @@
     background-color: transparent;
     border: 2px solid nb-theme(btn-secondary-border);
   }
+
+  @include media-breakpoint-up(xxl) {
+    .example-container {
+      flex: 0 0 20%;
+      max-width: 20%;
+    }
+  }
 }
diff --git a/src/app/pages/forms/buttons/default-buttons/default-buttons.component.ts b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.ts
index e754912783..3a20485bb7 100644
--- a/src/app/pages/forms/buttons/default-buttons/default-buttons.component.ts
+++ b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.ts
@@ -7,103 +7,41 @@ import { Component } from '@angular/core';
 })
 export class DefaultButtonsComponent {
 
-  buttonsViews = [{
-    title: 'Default Buttons',
-    key: 'default',
-  }, {
-    title: 'Outline Buttons',
-    key: 'outline',
-  }];
-
-  selectedView = this.buttonsViews[0];
-
-  buttons = {
-    'default': [
-      {
-        status: 'primary',
-        container: 'primary-container',
-        containerTitle: 'Primary Button',
-        title: 'Primary',
-        default: '#7659ff',
-      }, {
-        status: 'warning',
-        container: 'warning-container',
-        containerTitle: 'Warning Button',
-        title: 'Warning',
-        default: '#ffcb17',
-      }, {
-        status: 'success',
-        container: 'success-container',
-        containerTitle: 'Success Button',
-        title: 'Success',
-        default: '#00d977',
-      }, {
-        status: 'info',
-        container: 'info-container',
-        containerTitle: 'Info Button',
-        title: 'Info',
-        default: '#0088ff',
-      }, {
-        status: 'danger',
-        container: 'danger-container',
-        containerTitle: 'Danger Button',
-        title: 'Danger',
-        default: '#ff386a',
-      }, {
-        bootstrap: true,
-        class: 'btn-secondary',
-        container: 'secondary-container',
-        containerTitle: 'Default Button',
-        title: 'Default',
-        default: '#bdbaff',
-      },
-    ],
-
-    'outline': [
-      {
-        outline: true,
-        status: 'primary',
-        container: 'primary-container outline',
-        containerTitle: 'Primary Button',
-        title: 'Primary',
-        default: '#7659ff',
-      }, {
-        outline: true,
-        status: 'warning',
-        container: 'warning-container outline',
-        containerTitle: 'Warning Button',
-        title: 'Warning',
-        default: '#ffcb17',
-      }, {
-        outline: true,
-        status: 'success',
-        container: 'success-container outline',
-        containerTitle: 'Success Button',
-        title: 'Success',
-        default: '#00d977',
-      }, {
-        outline: true,
-        status: 'info',
-        container: 'info-container',
-        containerTitle: 'Info Button',
-        title: 'Info',
-        default: '#0088ff',
-      }, {
-        outline: true,
-        status: 'danger',
-        container: 'danger-container outline',
-        containerTitle: 'Danger Button',
-        title: 'Danger',
-        default: '#ff386a',
-      }, {
-        bootstrap: true,
-        outline: true,
-        class: 'btn-outline-secondary',
-        container: 'secondary-container outline',
-        containerTitle: 'Default Button',
-        title: 'Default',
-        default: '#bdbaff',
-      },
-    ],
-  };
+  buttons = [
+    {
+      status: 'primary',
+      container: 'primary-container',
+      containerTitle: 'Primary Button',
+      title: 'Primary',
+      default: '#7659ff',
+    },
+    {
+      status: 'warning',
+      container: 'warning-container',
+      containerTitle: 'Warning Button',
+      title: 'Warning',
+      default: '#ffcb17',
+    },
+    {
+      status: 'success',
+      container: 'success-container',
+      containerTitle: 'Success Button',
+      title: 'Success',
+      default: '#00d977',
+    },
+    {
+      status: 'info',
+      container: 'info-container',
+      containerTitle: 'Info Button',
+      title: 'Info',
+      default: '#0088ff',
+    },
+    {
+      status: 'danger',
+      container: 'danger-container',
+      containerTitle: 'Danger Button',
+      title: 'Danger',
+      default: '#ff386a',
+    },
+  ];
 }
diff --git a/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.html b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.html
index 3b05731d8c..6d38ba52b1 100644
--- a/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.html
+++ b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.html
@@ -7,8 +7,7 @@
           <span>{{ hb.title }}</span>
         </div>
         <div class="container-btn">
-          <button *ngIf="!hb.bootstrap" class="btn-demo" nbButton hero status="{{ hb.status }}">{{ hb.buttonTitle }}</button>
-          <button *ngIf="hb.bootstrap" class="btn {{ hb.class }} btn-demo">{{ hb.buttonTitle }}</button>
+          <button class="btn-demo" nbButton hero status="{{ hb.status }}">{{ hb.buttonTitle }}</button>
         </div>
         <div class="{{ hb.container }}">
           <div class="state-container" *ngIf="hb[themeName].border">
diff --git a/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.scss b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.scss
index d2e3cfde48..3ec8f28343 100644
--- a/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.scss
+++ b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.scss
@@ -1,5 +1,7 @@
 @import '../../../../@theme/styles/themes';
 @import '~@nebular/bootstrap/styles/buttons';
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
 
@@ -132,4 +134,11 @@
   .example-container {
     margin-bottom: 1.5rem;
   }
+
+  @include media-breakpoint-up(xxl) {
+    .example-container {
+      flex: 0 0 20%;
+      max-width: 20%;
+    }
+  }
 }
diff --git a/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.ts b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.ts
index 01e7830db4..19a0c268ae 100644
--- a/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.ts
+++ b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.ts
@@ -21,158 +21,143 @@ export class HeroButtonComponent implements OnDestroy {
   }
 
   init(colors: any) {
-    this.settings = [{
-      status: 'primary',
-      container: 'primary-container',
-      title: 'Primary Button',
-      buttonTitle: 'Primary',
-      default: {
-        gradientLeft: `adjust-hue(${colors.primary}, 20deg)`,
-        gradientRight: colors.primary,
-      },
-      corporate: {
-        color: colors.primary,
-        glow: {
-          params: '0 0 20px 0',
-          color: 'rgba (115, 161, 255, 0.5)',
+    this.settings = [
+      {
+        status: 'primary',
+        container: 'primary-container',
+        title: 'Primary Button',
+        buttonTitle: 'Primary',
+        default: {
+          gradientLeft: `adjust-hue(${colors.primary}, 20deg)`,
+          gradientRight: colors.primary,
         },
-      },
-      cosmic: {
-        gradientLeft: `adjust-hue(${colors.primary}, 20deg)`,
-        gradientRight: colors.primary,
-        bevel: `shade(${colors.primary}, 14%)`,
-        shadow: 'rgba (6, 7, 64, 0.5)',
-        glow: {
-          params: '0 2px 12px 0',
-          color: `adjust-hue(${colors.primary}, 10deg)`,
+        corporate: {
+          color: colors.primary,
+          glow: {
+            params: '0 0 20px 0',
+            color: 'rgba (115, 161, 255, 0.5)',
+          },
         },
-      },
-    }, {
-      status: 'warning',
-      container: 'warning-container',
-      title: 'Warning Button',
-      buttonTitle: 'Warning',
-      default: {
-        gradientLeft: `adjust-hue(${colors.warning}, 10deg)`,
-        gradientRight: colors.warning,
-      },
-      corporate: {
-        color: colors.warning,
-        glow: {
-          params: '0 0 20px 0',
-          color: 'rgba (256, 163, 107, 0.5)',
+        cosmic: {
+          gradientLeft: `adjust-hue(${colors.primary}, 20deg)`,
+          gradientRight: colors.primary,
+          bevel: `shade(${colors.primary}, 14%)`,
+          shadow: 'rgba (6, 7, 64, 0.5)',
+          glow: {
+            params: '0 2px 12px 0',
+            color: `adjust-hue(${colors.primary}, 10deg)`,
+          },
         },
       },
-      cosmic: {
-        gradientLeft: `adjust-hue(${colors.warning}, 10deg)`,
-        gradientRight: colors.warning,
-        bevel: `shade(${colors.warning}, 14%)`,
-        shadow: 'rgba (33, 7, 77, 0.5)',
-        glow: {
-          params: '0 2px 12px 0',
-          color: `adjust-hue(${colors.warning}, 5deg)`,
+      {
+        status: 'warning',
+        container: 'warning-container',
+        title: 'Warning Button',
+        buttonTitle: 'Warning',
+        default: {
+          gradientLeft: `adjust-hue(${colors.warning}, 10deg)`,
+          gradientRight: colors.warning,
         },
-      },
-    }, {
-      status: 'success',
-      container: 'success-container',
-      title: 'Success Button',
-      buttonTitle: 'Success',
-      default: {
-        gradientLeft: `adjust-hue(${colors.success}, 20deg)`,
-        gradientRight: colors.success,
-      },
-      corporate: {
-        color: colors.success,
-        glow: {
-          params: '0 0 20px 0',
-          color: 'rgba (93, 207, 227, 0.5)',
+        corporate: {
+          color: colors.warning,
+          glow: {
+            params: '0 0 20px 0',
+            color: 'rgba (256, 163, 107, 0.5)',
+          },
         },
-      },
-      cosmic: {
-        gradientLeft: `adjust-hue(${colors.success}, 20deg)`,
-        gradientRight: colors.success,
-        bevel: `shade(${colors.success}, 14%)`,
-        shadow: 'rgba (33, 7, 77, 0.5)',
-        glow: {
-          params: '0 2px 12px 0',
-          color: `adjust-hue(${colors.success}, 10deg)`,
+        cosmic: {
+          gradientLeft: `adjust-hue(${colors.warning}, 10deg)`,
+          gradientRight: colors.warning,
+          bevel: `shade(${colors.warning}, 14%)`,
+          shadow: 'rgba (33, 7, 77, 0.5)',
+          glow: {
+            params: '0 2px 12px 0',
+            color: `adjust-hue(${colors.warning}, 5deg)`,
+          },
         },
       },
-    }, {
-      status: 'info',
-      container: 'info-container',
-      title: 'Info Button',
-      buttonTitle: 'Info',
-      default: {
-        gradientLeft: `adjust-hue(${colors.info}, -10deg)`,
-        gradientRight: colors.info,
-      },
-      corporate: {
-        color: colors.info,
-        glow: {
-          params: '0 0 20px 0',
-          color: 'rgba (186, 127, 236, 0.5)',
+      {
+        status: 'success',
+        container: 'success-container',
+        title: 'Success Button',
+        buttonTitle: 'Success',
+        default: {
+          gradientLeft: `adjust-hue(${colors.success}, 20deg)`,
+          gradientRight: colors.success,
         },
-      },
-      cosmic: {
-        gradientLeft: `adjust-hue(${colors.info}, -10deg)`,
-        gradientRight: colors.info,
-        bevel: `shade(${colors.info}, 14%)`,
-        shadow: 'rgba (33, 7, 77, 0.5)',
-        glow: {
-          params: '0 2px 12px 0',
-          color: `adjust-hue(${colors.info}, -5deg)`,
+        corporate: {
+          color: colors.success,
+          glow: {
+            params: '0 0 20px 0',
+            color: 'rgba (93, 207, 227, 0.5)',
+          },
         },
-      },
-    }, {
-      status: 'danger',
-      container: 'danger-container',
-      title: 'Danger Button',
-      buttonTitle: 'Danger',
-      default: {
-        gradientLeft: `adjust-hue(${colors.danger}, -20deg)`,
-        gradientRight: colors.danger,
-      },
-      corporate: {
-        color: colors.danger,
-        glow: {
-          params: '0 0 20px 0',
-          color: 'rgba (255, 107, 131, 0.5)',
+        cosmic: {
+          gradientLeft: `adjust-hue(${colors.success}, 20deg)`,
+          gradientRight: colors.success,
+          bevel: `shade(${colors.success}, 14%)`,
+          shadow: 'rgba (33, 7, 77, 0.5)',
+          glow: {
+            params: '0 2px 12px 0',
+            color: `adjust-hue(${colors.success}, 10deg)`,
+          },
         },
       },
-      cosmic: {
-        gradientLeft: `adjust-hue(${colors.danger}, -20deg)`,
-        gradientRight: colors.danger,
-        bevel: `shade(${colors.danger}, 14%)`,
-        shadow: 'rgba (33, 7, 77, 0.5)',
-        glow: {
-          params: '0 2px 12px 0',
-          color: `adjust-hue(${colors.danger}, -10deg)`,
+      {
+        status: 'info',
+        container: 'info-container',
+        title: 'Info Button',
+        buttonTitle: 'Info',
+        default: {
+          gradientLeft: `adjust-hue(${colors.info}, -10deg)`,
+          gradientRight: colors.info,
+        },
+        corporate: {
+          color: colors.info,
+          glow: {
+            params: '0 0 20px 0',
+            color: 'rgba (186, 127, 236, 0.5)',
+          },
+        },
+        cosmic: {
+          gradientLeft: `adjust-hue(${colors.info}, -10deg)`,
+          gradientRight: colors.info,
+          bevel: `shade(${colors.info}, 14%)`,
+          shadow: 'rgba (33, 7, 77, 0.5)',
+          glow: {
+            params: '0 2px 12px 0',
+            color: `adjust-hue(${colors.info}, -5deg)`,
+          },
         },
       },
-    }, {
-      bootstrap: true,
-      class: 'btn-hero-secondary',
-      container: 'secondary-container',
-      title: 'Ghost Button',
-      buttonTitle: 'Ghost',
-      default: {
-        border: '#dadfe6',
-      },
-      corporate: {
-        color: '#edf2f5',
-      },
-      cosmic: {
-        border: colors.primary,
-        bevel: '#665ebd',
-        shadow: 'rgba (33, 7, 77, 0.5)',
-        glow: {
-          params: '0 2px 12px 0',
-          color: 'rgba (146, 141, 255, 1)',
+      {
+        status: 'danger',
+        container: 'danger-container',
+        title: 'Danger Button',
+        buttonTitle: 'Danger',
+        default: {
+          gradientLeft: `adjust-hue(${colors.danger}, -20deg)`,
+          gradientRight: colors.danger,
+        },
+        corporate: {
+          color: colors.danger,
+          glow: {
+            params: '0 0 20px 0',
+            color: 'rgba (255, 107, 131, 0.5)',
+          },
+        },
+        cosmic: {
+          gradientLeft: `adjust-hue(${colors.danger}, -20deg)`,
+          gradientRight: colors.danger,
+          bevel: `shade(${colors.danger}, 14%)`,
+          shadow: 'rgba (33, 7, 77, 0.5)',
+          glow: {
+            params: '0 2px 12px 0',
+            color: `adjust-hue(${colors.danger}, -10deg)`,
+          },
         },
       },
-    }];
+    ];
   }
 
   ngOnDestroy() {
diff --git a/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.html b/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.html
new file mode 100644
index 0000000000..2b031f4b64
--- /dev/null
+++ b/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.html
@@ -0,0 +1,45 @@
+<nb-card>
+  <nb-card-header>
+    <span>Default Buttons</span>
+  </nb-card-header>
+  <nb-card-body>
+    <div class="row">
+      <div class="example-container col-md-4" *ngFor="let b of buttons">
+        <div class="container-title">
+          <span>{{ b.containerTitle }}</span>
+        </div>
+        <div class="container-btn">
+          <button nbButton
+                  outline
+                  status="{{ b.status }}"
+                  class="btn-demo">
+            {{ b.title }}
+          </button>
+        </div>
+        <div class="{{ b.container }}">
+          <div class="state-container">
+            <div class="state-value original"></div>
+            <div class="state-details">
+              <span class="header">Default</span>
+              <span class="subheader">{{ b.default }}</span>
+            </div>
+          </div>
+          <div class="state-container">
+            <div class="state-value hover"></div>
+            <div class="state-details">
+              <span class="header">Hover</span>
+              <span class="subheader">14% white</span>
+            </div>
+          </div>
+          <div class="state-container">
+            <div class="state-value active"></div>
+            <div class="state-details">
+              <span class="header">Active</span>
+              <span class="subheader">14% black</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.scss b/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.scss
new file mode 100644
index 0000000000..5ed3e93e32
--- /dev/null
+++ b/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.scss
@@ -0,0 +1,130 @@
+@import '../../../../@theme/styles/themes';
+@import '~@nebular/bootstrap/styles/buttons';
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/breakpoints';
+
+@include nb-install-component() {
+
+  nb-card-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  nb-card-body {
+    padding-bottom: 0;
+  }
+
+  .example-container {
+    margin-bottom: 1.5rem;
+  }
+
+  .primary-container {
+    .original {
+      background-color: nb-theme(btn-primary-bg);
+    }
+    .hover {
+      @include btn-primary-hover();
+    }
+    .active {
+      @include btn-primary-active();
+    }
+  }
+
+  .primary-container.outline .original {
+    background-color: transparent;
+    border: 2px solid nb-theme(btn-primary-bg);
+  }
+
+  .success-container {
+    .original {
+      background-color: nb-theme(btn-success-bg);
+    }
+    .hover {
+      @include btn-success-hover();
+    }
+    .active {
+      @include btn-success-active();
+    }
+  }
+
+  .success-container.outline .original {
+    background-color: transparent;
+    border: 2px solid nb-theme(btn-success-bg);
+  }
+
+  .warning-container {
+    .original {
+      background-color: nb-theme(btn-warning-bg);
+    }
+    .hover {
+      @include btn-warning-hover();
+    }
+    .active {
+      @include btn-warning-active();
+    }
+  }
+
+  .warning-container.outline .original {
+    background-color: transparent;
+    border: 2px solid nb-theme(btn-warning-bg);
+  }
+
+  .info-container {
+    .original {
+      background-color: nb-theme(btn-info-bg);
+    }
+    .hover {
+      @include btn-info-hover();
+    }
+    .active {
+      @include btn-info-active();
+    }
+  }
+
+  .info-container.outline .original {
+    background-color: transparent;
+    border: 2px solid nb-theme(btn-info-bg);
+  }
+
+  .danger-container {
+    .original {
+      background-color: nb-theme(btn-danger-bg);
+    }
+    .hover {
+      @include btn-danger-hover();
+    }
+    .active {
+      @include btn-danger-active();
+    }
+  }
+
+  .danger-container.outline .original {
+    background-color: transparent;
+    border: 2px solid nb-theme(btn-danger-bg);
+  }
+
+  .secondary-container {
+    .original {
+      border: 2px solid nb-theme(btn-secondary-border);
+    }
+    .hover {
+      @include btn-secondary-hover();
+    }
+    .active {
+      @include btn-secondary-active();
+    }
+  }
+
+  .secondary-container.outline .original {
+    background-color: transparent;
+    border: 2px solid nb-theme(btn-secondary-border);
+  }
+
+  @include media-breakpoint-up(xxl) {
+    .example-container {
+      flex: 0 0 20%;
+      max-width: 20%;
+    }
+  }
+}
diff --git a/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.ts b/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.ts
new file mode 100644
index 0000000000..9b16982daf
--- /dev/null
+++ b/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.ts
@@ -0,0 +1,47 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ngx-outline-buttons',
+  styleUrls: ['./outline-buttons.component.scss'],
+  templateUrl: './outline-buttons.component.html',
+})
+export class OutlineButtonsComponent {
+
+  buttons = [
+    {
+      status: 'primary',
+      container: 'primary-container outline',
+      containerTitle: 'Primary Button',
+      title: 'Primary',
+      default: '#7659ff',
+    },
+    {
+      status: 'warning',
+      container: 'warning-container outline',
+      containerTitle: 'Warning Button',
+      title: 'Warning',
+      default: '#ffcb17',
+    },
+    {
+      status: 'success',
+      container: 'success-container outline',
+      containerTitle: 'Success Button',
+      title: 'Success',
+      default: '#00d977',
+    },
+    {
+      status: 'info',
+      container: 'info-container',
+      containerTitle: 'Info Button',
+      title: 'Info',
+      default: '#0088ff',
+    },
+    {
+      status: 'danger',
+      container: 'danger-container outline',
+      containerTitle: 'Danger Button',
+      title: 'Danger',
+      default: '#ff386a',
+    },
+  ];
+}
diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.html b/src/app/pages/forms/form-inputs/form-inputs.component.html
index 53f560c4d9..b81ce9342b 100644
--- a/src/app/pages/forms/form-inputs/form-inputs.component.html
+++ b/src/app/pages/forms/form-inputs/form-inputs.component.html
@@ -29,11 +29,6 @@
         <div class="input-group">
           <input type="text" nbInput fullWidth shape="round" placeholder="Rounded border">
         </div>
-        <div class="form-group">
-          <input type="text" placeholder="Project" class="form-control"/>
-          <small class="form-text">A block of help text that breaks into a new line and may extend beyond one line.
-          </small>
-        </div>
         <div class="input-group">
           <input type="text" nbInput fullWidth placeholder="Disabled input" disabled/>
         </div>
@@ -51,97 +46,9 @@
         </div>
       </nb-card-body>
     </nb-card>
-
-    <nb-card>
-      <nb-card-header>Input Groups</nb-card-header>
-      <nb-card-body>
-        <div class="input-group">
-          <span class="input-group-addon success">@</span>
-          <input type="text" class="form-control" placeholder="Username"/>
-        </div>
-
-        <div class="input-group mail-btn-group">
-          <span class="input-group-prepend">
-            <button class="btn btn-primary btn-icon input-group-text">
-              <i class="ion-ios-email-outline"></i>
-            </button>
-          </span>
-          <input type="text" class="form-control" placeholder="Recipient's username">
-          <span class="input-group-append">
-            <button class="btn btn-primary input-group-text">
-              @example.com
-            </button>
-          </span>
-        </div>
-        <div class="input-group">
-          <input type="text" class="form-control" placeholder="Search for...">
-          <span class="input-group-append">
-            <button class="btn btn-danger input-group-text">
-              Search
-            </button>
-          </span>
-        </div>
-        <div class="input-group">
-          <div class="dropdown input-group-prepend input-group-btn" ngbDropdown>
-            <button type="button" class="btn btn-success dropdown-toggle" ngbDropdownToggle>
-              Action
-            </button>
-            <ul class="dropdown-menu" ngbDropdownMenu>
-              <li class="dropdown-item">Action</li>
-              <li class="dropdown-item">Another action</li>
-              <li class="dropdown-item">Something else here</li>
-              <div role="separator" class="dropdown-divider"></div>
-              <li class="dropdown-item">Separated link</li>
-            </ul>
-          </div>
-          <input type="text" class="form-control">
-        </div>
-      </nb-card-body>
-    </nb-card>
-
-    <nb-card>
-      <nb-card-header>Selects</nb-card-header>
-      <nb-card-body>
-        <div class="form-group">
-          <label>Simple Select</label>
-          <select class="form-control">
-            <option>Minsk</option>
-            <option>Gomel</option>
-            <option>Brest</option>
-            <option>Grodno</option>
-            <option>Mogilev</option>
-          </select>
-        </div>
-        <div class="form-group">
-          <label>Multiple Select</label>
-          <select multiple class="form-control">
-            <option>Item 1</option>
-            <option>Item 2</option>
-            <option>Item 3</option>
-            <option>Item 4</option>
-            <option>Item 5</option>
-          </select>
-        </div>
-      </nb-card-body>
-    </nb-card>
   </div>
 
   <div class="col-lg-6">
-    <nb-card>
-      <nb-card-header>Input Styles</nb-card-header>
-      <nb-card-body>
-        <div class="input-group input-group-border-only">
-          <input type="text" placeholder="Border Only" class="form-control"/>
-        </div>
-        <div class="input-group">
-          <input type="text" placeholder="Default Input" class="form-control">
-        </div>
-        <div class="input-group input-group-fill-only">
-          <input type="text" placeholder="Fill Only" class="form-control">
-        </div>
-      </nb-card-body>
-    </nb-card>
-
     <nb-card>
       <nb-card-header>Validation States</nb-card-header>
       <nb-card-body>
@@ -172,11 +79,6 @@
           <div class="demo-checkboxes col-sm-4">
             <nb-checkbox>Checkbox 1</nb-checkbox>
             <nb-checkbox [value]="true">Checkbox 2</nb-checkbox>
-
-            <div class="custom-control custom-checkbox">
-              <input type="checkbox" class="custom-control-input" id="b-checkbox">
-              <label class="custom-control-label" for="b-checkbox">Bootstrap Checkbox</label>
-            </div>
           </div>
           <div class="demo-radio col-sm-4">
             <nb-radio-group [(value)]="radioGroupValue">
@@ -196,7 +98,7 @@
           </div>
           <div class="demo-disabled-checkbox-radio col-sm-4">
             <nb-checkbox disabled>Disabled Checkbox</nb-checkbox>
-            <nb-radio-group>
+            <nb-radio-group disabled>
               <nb-radio
                 [value]="'Disabled Value'">
                 Disabled Radio
@@ -206,33 +108,5 @@
         </div>
       </nb-card-body>
     </nb-card>
-
-    <nb-card>
-      <nb-card-body class="demo-rating">
-        <span class="rating-header">Rating</span>
-        <div>
-          <ngb-rating [(rate)]="starRate" max=5>
-            <ng-template let-fill="fill">
-              <span class="star fill" [class.filled]="fill === 100">
-                <i class="ion-android-star" *ngIf="fill === 100"></i>
-                <i class="ion-android-star-outline" *ngIf="fill !== 100"></i>
-              </span>
-            </ng-template>
-          </ngb-rating>
-          <span class="current-rate">{{ starRate }}</span>
-        </div>
-        <div>
-          <ngb-rating [(rate)]="heartRate" max=5>
-            <ng-template let-fill="fill">
-              <span class="star fill" [class.filled]="fill === 100">
-                <i class="ion-ios-heart" *ngIf="fill === 100"></i>
-                <i class="ion-ios-heart-outline" *ngIf="fill !== 100"></i>
-              </span>
-            </ng-template>
-          </ngb-rating>
-          <span class="current-rate">{{ heartRate }}</span>
-        </div>
-      </nb-card-body>
-    </nb-card>
   </div>
 </div>
diff --git a/src/app/pages/modal-overlays/modal-overlays-routing.module.ts b/src/app/pages/modal-overlays/modal-overlays-routing.module.ts
index b2146d86ba..9e4eba3cbc 100644
--- a/src/app/pages/modal-overlays/modal-overlays-routing.module.ts
+++ b/src/app/pages/modal-overlays/modal-overlays-routing.module.ts
@@ -5,7 +5,6 @@ import { DialogComponent } from './dialog/dialog.component';
 import { WindowComponent } from './window/window.component';
 import { PopoversComponent } from './popovers/popovers.component';
 import { ToastrComponent } from './toastr/toastr.component';
-import { ModalsComponent } from './modals/modals.component';
 import { TooltipComponent } from './tooltip/tooltip.component';
 
 const routes: Routes = [{
@@ -20,10 +19,6 @@ const routes: Routes = [{
       path: 'window',
       component: WindowComponent,
     },
-    {
-      path: 'modal',
-      component: ModalsComponent,
-    },
     {
       path: 'popover',
       component: PopoversComponent,
diff --git a/src/app/pages/modal-overlays/modal-overlays.module.ts b/src/app/pages/modal-overlays/modal-overlays.module.ts
index 7afb85baa1..2a0e582a75 100644
--- a/src/app/pages/modal-overlays/modal-overlays.module.ts
+++ b/src/app/pages/modal-overlays/modal-overlays.module.ts
@@ -18,8 +18,6 @@ import {
   NgxPopoverCardComponent, NgxPopoverFormComponent,
   NgxPopoverTabsComponent,
 } from './popovers/popover-examples.component';
-import { ModalsComponent } from './modals/modals.component';
-import { ModalComponent } from './modals/modal/modal.component';
 import { TooltipComponent } from './tooltip/tooltip.component';
 
 
@@ -32,8 +30,6 @@ const COMPONENTS = [
   WindowComponent,
   WindowFormComponent,
   PopoversComponent,
-  ModalsComponent,
-  ModalComponent,
   NgxPopoverCardComponent,
   NgxPopoverFormComponent,
   NgxPopoverTabsComponent,
@@ -41,7 +37,6 @@ const COMPONENTS = [
 ];
 
 const ENTRY_COMPONENTS = [
-  ModalComponent,
   ShowcaseDialogComponent,
   DialogNamePromptComponent,
   WindowFormComponent,
diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts
index 7d4cfcc118..0ad3d86aeb 100644
--- a/src/app/pages/pages-menu.ts
+++ b/src/app/pages/pages-menu.ts
@@ -18,7 +18,7 @@ export const MENU_ITEMS: NbMenuItem[] = [
   },
   {
     title: 'Extra Components',
-    icon: 'nb-gear',
+    icon: 'nb-star',
     children: [
       {
         title: 'Calendar',
@@ -127,10 +127,6 @@ export const MENU_ITEMS: NbMenuItem[] = [
         title: 'Window',
         link: '/pages/modal-overlays/window',
       },
-      {
-        title: 'Modal',
-        link: '/pages/modal-overlays/modal',
-      },
       {
         title: 'Popover',
         link: '/pages/modal-overlays/popover',
@@ -145,6 +141,24 @@ export const MENU_ITEMS: NbMenuItem[] = [
       },
     ],
   },
+  {
+    title: 'Bootstrap',
+    icon: 'nb-gear',
+    children: [
+      {
+        title: 'Form Inputs',
+        link: '/pages/bootstrap/inputs',
+      },
+      {
+        title: 'Buttons',
+        link: '/pages/bootstrap/buttons',
+      },
+      {
+        title: 'Modal',
+        link: '/pages/bootstrap/modal',
+      },
+    ],
+  },
   {
     title: 'Maps',
     icon: 'nb-location',
diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts
index e65e802454..613a5fca3e 100644
--- a/src/app/pages/pages-routing.module.ts
+++ b/src/app/pages/pages-routing.module.ts
@@ -24,6 +24,9 @@ const routes: Routes = [{
   }, {
     path: 'extra-components',
     loadChildren: './extra-components/extra-components.module#ExtraComponentsModule',
+  }, {
+    path: 'bootstrap',
+    loadChildren: './bootstrap/bootstrap.module#BootstrapModule',
   }, {
     path: 'maps',
     loadChildren: './maps/maps.module#MapsModule',