diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 68df9a4f0d1..b2a3c25614d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -19,7 +19,7 @@
 
 For Ionic V1 issues - http://plnkr.co/edit/Xo1QyAUx35ny1Xf9ODHx?p=preview
 
-For Ionic issues - http://plnkr.co/edit/z0DzVL?p=preview
+For Ionic issues - http://plnkr.co/edit/cpeRJs?p=preview
 -->
 
 **Related code:**
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db182dd9770..1729eb1473c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,275 @@
+<a name="3.6.0"></a>
+# [3.6.0](https://github.com/ionic-team/ionic/compare/v3.5.3...v3.6.0) (2017-07-27)
+
+
+### Upgrade Instructions
+
+`ionic-angular` 3.6.0 requires developer's to update to the latest version of the `Ionic CLI` and `@ionic/app-scripts`.
+
+To upgrade, please run
+
+```
+npm install -g ionic@latest
+npm install @ionic/app-scripts@latest --save-dev
+npm install ionic-angular@latest --save
+```
+
+### Notes
+
+The URL when using deep linking is shortened and improved in this release. Due to a limitation in our nav system, if you're using `ion-tabs` and have a tab name that matches a segment, meaning you have a tab name of `schedule` and a segment of `schedule`, there could potentially be issues. To mitigate these issues, make sure you set the `tabUrlPath` property on the `ion-tab` and give it a unique name. This limitation will require an API change to fix so it will be resolved in `ionic-angular` 4.x.
+
+
+The upgrades include necessary changes to generators that add back lazy loading functionality, as well as an improved way of generating component/directives/and pipes.
+
+### New Generators
+
+The release adds back the functionality to generate lazy loaded pages.
+To generate a lazy loaded page, run:
+
+```bash
+ionic g page <Page-Name>
+```
+
+This will include a `.module.ts` file in the page directory created. If you do not want to generate a lazy loaded page, you can run:
+
+```bash
+ionic g page <Page-Name> --no-module
+```
+
+This will also generate lazy loaded tabs as well, accepting the `--no-module` flag as well to disable it.
+
+
+For pipes/components/components, we now generate a shared common module for each of these.
+
+So running:
+
+```bash
+ionic g component music-card
+```
+
+Will create a `components/components.module.ts` file that declares and exports the `music-card` component.
+We think that this will allow developers to get up and running with custom components much faster and will less overhead.
+
+### Bug Fixes
+
+* **list:** remove margin of MD buttons in ion-item-options ([#12263](https://github.com/ionic-team/ionic/issues/12263)) ([97f9522](https://github.com/ionic-team/ionic/commit/97f9522))
+* **nav:** make call to setPages return the promise so if it rejects it doesn't get lost ([de0f9d5](https://github.com/ionic-team/ionic/commit/de0f9d5))
+* **navigation:** account for race conditions in developer's code ([4596dbe](https://github.com/ionic-team/ionic/commit/4596dbe))
+* **navigation:** fix bug where that occurred when tab identifier and segment had the exact same string ([add0c4e](https://github.com/ionic-team/ionic/commit/add0c4e))
+* **navigation:** fix null pointer exceptions that would occur when destroying a nav controller while its transitioning ([584afd0](https://github.com/ionic-team/ionic/commit/584afd0))
+* **navigation:** reduce urls to minimum set of fields ([a8ceee4](https://github.com/ionic-team/ionic/commit/a8ceee4))
+
+
+### Features
+
+* **generators:** refactor generators ([400aa54](https://github.com/ionic-team/ionic/commit/400aa54))
+
+
+
+<a name="3.5.3"></a>
+## [3.5.3](https://github.com/ionic-team/ionic/compare/v3.5.2...v3.5.3) (2017-07-14)
+
+## Upgrade Instructions
+`ionic-angular@3.5.3` is a drop-in replacement for `3.5.2`. To install it, simply run `npm install ionic-angular@3.5.3 --save --save-exact`.
+
+### Bug Fixes
+
+* **app:** restore getActiveNav api ([2d49e10](https://github.com/ionic-team/ionic/commit/2d49e10))
+
+
+
+<a name="3.5.2"></a>
+## [3.5.2](https://github.com/ionic-team/ionic/compare/v3.5.1...v3.5.2) (2017-07-13)
+
+## Upgrade Instructions
+`ionic-angular@3.5.2` is a drop-in replacement for `3.5.1`. To install it, simply run `npm install ionic-angular@3.5.2 --save --save-exact`.
+
+We have released a new version of our build process for `ionic-angular` apps, `@ionic/app-scripts` in conjunction with this release of `ionic-angular`. While it's not a required update, we recommend it because we have greatly improved the developer experience. Incremental, or update builds while developing are much faster now. We've also added `scope hoisting` for better start-up performance on production builds.
+
+To upgrade to `@ionic/app-scripts`, run the following command:
+
+```
+rm -rf node_modules
+npm install @ionic/app-scripts@2.0.2 --save-dev --save-exact
+```
+
+After installing the update, you'll need to make a minor change to the `src/index.html` file to include a new `<script>` tag for `build/vendor.js`. The reason for this breaking change in `@ionic/app-scripts` is for faster builds. By separating out the `node_modules` dependencies into a `vendor.js` file, the incremental build is faster.
+
+```
+...
+<body>
+
+  <!-- Ionic's root component and where the app will load -->
+  <ion-app></ion-app>
+
+  <!-- cordova.js required for cordova apps -->
+  <script src="cordova.js"></script>
+
+  <!-- The polyfills js is generated during the build process -->
+  <script src="build/polyfills.js"></script>
+
+  <!-- The vendor js is generated during the build process
+       and includes all files in the node_modules directory -->
+  <script src="build/vendor.js"></script>
+
+  <!-- The bundle js is generated during the build process -->
+  <script src="build/main.js"></script>
+
+</body>
+...
+```
+
+If you're customizing `@ionic/app-scripts`, we recommend you review the [changelog](https://github.com/ionic-team/ionic-app-scripts/blob/master/CHANGELOG.md), and update any of your configs accordingly.
+
+## Notes
+`3.5.2` is the same as `3.5.1`. We had a small publishing error.
+
+### Bug Fixes
+
+* **navigation:** fix swipe-to-go-back ([04e78d8](https://github.com/ionic-team/ionic/commit/04e78d8))
+* **navigation:** mark as not transitioning on success in addition to '_transitionFinish', provide no ([48b3243](https://github.com/ionic-team/ionic/commit/48b3243))
+* **navigation:** navs can have n child navs instead of just one ([fce4422](https://github.com/ionic-team/ionic/commit/fce4422))
+* **navigation:** restore getActiveChildNav method to maintain old API, add deprecation notice ([d22d77b](https://github.com/ionic-team/ionic/commit/d22d77b))
+* **navigation:** ts2.4 compatibility ([08be9dc](https://github.com/ionic-team/ionic/commit/08be9dc)), closes [#12233](https://github.com/ionic-team/ionic/issues/12233) [#12235](https://github.com/ionic-team/ionic/issues/12235)
+* **select:** not activated on enter in input field ([ad25cd1](https://github.com/ionic-team/ionic/commit/ad25cd1)), closes [#12202](https://github.com/ionic-team/ionic/issues/12202)
+* **sliding-item:** ionSwipe event is fired ([#12157](https://github.com/ionic-team/ionic/issues/12157)) ([b5aa304](https://github.com/ionic-team/ionic/commit/b5aa304)), closes [#12146](https://github.com/ionic-team/ionic/issues/12146)
+* **tabs:** have tabs behavior match nav when navigating back/forth via the url ([3f39e14](https://github.com/ionic-team/ionic/commit/3f39e14))
+
+
+### Features
+
+* **navigation:** support for named ion-nav/ion-tabs to improve url in the short term ([486bff0](https://github.com/ionic-team/ionic/commit/486bff0))
+
+
+<a name="3.5.1"></a>
+## [3.5.1](https://github.com/ionic-team/ionic/compare/v3.5.0...v3.5.1) (2017-07-13)
+
+See the [3.5.2](https://github.com/ionic-team/ionic/blob/master/CHANGELOG.md#352-2017-07-13) changelog. We had a publishing error here.
+
+<a name="3.5.0"></a>
+# [3.5.0](https://github.com/ionic-team/ionic/compare/v3.4.2...v3.5.0) (2017-06-28)
+
+### Steps to Upgrade
+
+`ionic-angular` should be set to version `3.5.0`.
+
+```
+npm install ionic-angular@3.5.0 --save --save-exact
+```
+
+### Notes
+There were major improvements made to navigation in this release of `ionic-angular`. Specifically, we updated Ionic to support a concept of `n` root navigation elements, instead of just one. This will enable first-class url support for things `split-pane`. Before `3.5.0`, only one section of the screen could be represented in the URL. With these changes, multiple sections can be. Another large change was improving the behavior surrounding browser behaviors, such as the back-and-forward buttons, as well as refresh. In general, Ionic should work much more intuitively in a web browser now.
+
+As a result of these improvements, if you're using deep linking, the urls of the application will be different with `3.5.0` than they were with previous Ionic releases. The URLs will likely change again in the near future with the next round of navigation improvements too. For now, we don't recommend using `href` attributes in the application. Using the `navPush` and `navPop` directives is a better option for now while URL support is being built-out.
+
+### Bug Fixes
+
+* **navigation:** add isTab check to getSegmentsFromNav ([f39c381](https://github.com/ionic-team/ionic/commit/f39c381))
+* **navigation:** fallback to name if component does not exist on segment ([30f69c8](https://github.com/ionic-team/ionic/commit/30f69c8))
+* **select:** _inputUpdated should not be called manually ([8dc08f9](https://github.com/ionic-team/ionic/commit/8dc08f9))
+* **select:** floating label ([e3a8d27](https://github.com/ionic-team/ionic/commit/e3a8d27)), closes [#12068](https://github.com/ionic-team/ionic/issues/12068)
+* **tabs:** use segment if it exists even if component exists ([016b90d](https://github.com/ionic-team/ionic/commit/016b90d))
+
+
+
+<a name="3.4.2"></a>
+## [3.4.2](https://github.com/ionic-team/ionic/compare/v3.4.1...v3.4.2) (2017-06-16)
+
+
+### Bug Fixes
+
+* **rtl:** use multi direction in order to override the default ltr ([70b5b6](https://github.com/ionic-team/ionic/commit/70b5b6))
+
+
+
+<a name="3.4.1"></a>
+## [3.4.1](https://github.com/ionic-team/ionic/compare/v3.4.0...v3.4.1) (2017-06-16)
+
+
+### Bug Fixes
+
+* **themes:** change default app-direction ([1ca7df](https://github.com/ionic-team/ionic/commit/1ca7df))
+
+
+
+<a name="3.4.0"></a>
+# [3.4.0](https://github.com/ionic-team/ionic/compare/v3.3.0...v3.4.0) (2017-06-15)
+
+### Steps to Upgrade
+
+`ionic-angular` should be set to version `3.4.0` in the package.json dependency list. The latest `@angular` release `4.1.3` is also supported. Feel free to update apps by updating the `package.json` dependencies to match below.
+
+```
+"dependencies": {
+  "@angular/common": "4.1.3",
+  "@angular/compiler": "4.1.3",
+  "@angular/compiler-cli": "4.1.3",
+  "@angular/core": "4.1.3",
+  "@angular/forms": "4.1.3",
+  "@angular/http": "4.1.3",
+  "@angular/platform-browser": "4.1.3",
+  "@angular/platform-browser-dynamic": "4.1.3",
+  "@ionic-native/core": "3.12.1",
+  "@ionic-native/splash-screen": "3.12.1",
+  "@ionic-native/status-bar": "3.12.1",
+  "@ionic/storage": "2.0.1",
+  "ionic-angular": "3.4.2",
+  "ionicons": "3.0.0",
+  "rxjs": "5.4.0",
+  "sw-toolbox": "3.6.0",
+  "zone.js": "0.8.12"
+},
+"devDependencies": {
+  "@ionic/app-scripts": "1.3.7",
+  "typescript": "2.3.4"
+}
+```
+
+### Bug Fixes
+
+* **button:** rtl fix for md ripple effect ([#11842](https://github.com/ionic-team/ionic/issues/11842)) ([bb966e5](https://github.com/ionic-team/ionic/commit/bb966e5))
+* **content:** scroll content should inherit background ([#11467](https://github.com/ionic-team/ionic/issues/11467)) ([6256b0f](https://github.com/ionic-team/ionic/commit/6256b0f))
+* **datetime:** set datetime direction the same on ltr and rtl ([#11992](https://github.com/ionic-team/ionic/issues/11992)) ([20c9dd7](https://github.com/ionic-team/ionic/commit/20c9dd7))
+* **gesture:** RTL fix for slide-gesture ([#11822](https://github.com/ionic-team/ionic/issues/11822)) ([59a1e3d](https://github.com/ionic-team/ionic/commit/59a1e3d))
+* **input:** add correct translate3d for rtl ([ef85ba6](https://github.com/ionic-team/ionic/commit/ef85ba6)), closes [#11745](https://github.com/ionic-team/ionic/issues/11745) [#11211](https://github.com/ionic-team/ionic/issues/11211)
+* **input:** better handling of attributes ([9f86e10](https://github.com/ionic-team/ionic/commit/9f86e10))
+* **input:** slightly longer delay for autofocus ([#12037](https://github.com/ionic-team/ionic/issues/12037)) ([54ac2e3](https://github.com/ionic-team/ionic/commit/54ac2e3))
+* **input:** use all supported attributes on both textareas and inputs ([#12028](https://github.com/ionic-team/ionic/issues/12028)) ([8041eed](https://github.com/ionic-team/ionic/commit/8041eed))
+* **item-sliding:** RTL fix for item sliding ([#11825](https://github.com/ionic-team/ionic/issues/11825)) ([10f4df4](https://github.com/ionic-team/ionic/commit/10f4df4))
+* **keyboard:** big keyboard/input refactor ([c10f72b](https://github.com/ionic-team/ionic/commit/c10f72b)), closes [#9699](https://github.com/ionic-team/ionic/issues/9699) [#11484](https://github.com/ionic-team/ionic/issues/11484) [#11389](https://github.com/ionic-team/ionic/issues/11389) [#11325](https://github.com/ionic-team/ionic/issues/11325) [#11291](https://github.com/ionic-team/ionic/issues/11291) [#10828](https://github.com/ionic-team/ionic/issues/10828) [#11291](https://github.com/ionic-team/ionic/issues/11291) [#10393](https://github.com/ionic-team/ionic/issues/10393) [#10257](https://github.com/ionic-team/ionic/issues/10257) [#9434](https://github.com/ionic-team/ionic/issues/9434) [#8933](https://github.com/ionic-team/ionic/issues/8933) [#7178](https://github.com/ionic-team/ionic/issues/7178) [#7047](https://github.com/ionic-team/ionic/issues/7047) [#10552](https://github.com/ionic-team/ionic/issues/10552) [#10393](https://github.com/ionic-team/ionic/issues/10393) [#10183](https://github.com/ionic-team/ionic/issues/10183) [#10187](https://github.com/ionic-team/ionic/issues/10187) [#10852](https://github.com/ionic-team/ionic/issues/10852) [#11578](https://github.com/ionic-team/ionic/issues/11578)
+* **menu:** rtl gesture for menu ([#11830](https://github.com/ionic-team/ionic/issues/11830)) ([30047f0](https://github.com/ionic-team/ionic/commit/30047f0))
+* **refresher:** border should only show when pulled ([#12015](https://github.com/ionic-team/ionic/issues/12015)) ([47e3c70](https://github.com/ionic-team/ionic/commit/47e3c70)), closes [#10994](https://github.com/ionic-team/ionic/issues/10994)
+* **rtl:** add icon-start and icon-end attributes ([#11737](https://github.com/ionic-team/ionic/issues/11737)) ([a40b872](https://github.com/ionic-team/ionic/commit/a40b872))
+* **sass:** add default flag to variables ([#11779](https://github.com/ionic-team/ionic/issues/11779)) ([f14d7d6](https://github.com/ionic-team/ionic/commit/f14d7d6))
+* **searchbar:** caret moving to the end when typing ([261bc4d](https://github.com/ionic-team/ionic/commit/261bc4d))
+* **segment:** fix border-radius logic for RTL ([#11981](https://github.com/ionic-team/ionic/issues/11981)) ([6db8c14](https://github.com/ionic-team/ionic/commit/6db8c14))
+* **select:** add cssClass for popover interface ([#11769](https://github.com/ionic-team/ionic/issues/11769)) ([1c25acb](https://github.com/ionic-team/ionic/commit/1c25acb))
+* **select:** return undefined when there are no options ([#11968](https://github.com/ionic-team/ionic/issues/11968)) ([dc6c586](https://github.com/ionic-team/ionic/commit/dc6c586)), closes [#10435](https://github.com/ionic-team/ionic/issues/10435)
+* **split-pane:** correct split-pane menu side order ([30dc247](https://github.com/ionic-team/ionic/commit/30dc247))
+* **textarea:** apply classes properly ([dc958c3](https://github.com/ionic-team/ionic/commit/dc958c3))
+* **toggle:** RTL fix for toggle ([2afb936](https://github.com/ionic-team/ionic/commit/2afb936))
+* **toolbar:** get the correct contrast color for md mode ([0f4ed1c](https://github.com/ionic-team/ionic/commit/0f4ed1c)), closes [#11848](https://github.com/ionic-team/ionic/issues/11848)
+* **toolbar:** use the correct contrast color for MD toolbar ([041689b](https://github.com/ionic-team/ionic/commit/041689b)), closes [#11848](https://github.com/ionic-team/ionic/issues/11848)
+* **transition:** RTL fix for transition on ios ([#11820](https://github.com/ionic-team/ionic/issues/11820)) ([6322134](https://github.com/ionic-team/ionic/commit/6322134))
+
+
+### Features
+
+* **background-position:** add background position support for rtl ([#11946](https://github.com/ionic-team/ionic/issues/11946)) ([305c306](https://github.com/ionic-team/ionic/commit/305c306))
+* **loading:** add enableBackdropDismiss to Loading ([#11937](https://github.com/ionic-team/ionic/issues/11937)) ([d0ae810](https://github.com/ionic-team/ionic/commit/d0ae810)), closes [#7975](https://github.com/ionic-team/ionic/issues/7975)
+* **loading:** add margin start variable ([#11980](https://github.com/ionic-team/ionic/issues/11980)) ([3e0d43e](https://github.com/ionic-team/ionic/commit/3e0d43e))
+* **rtl:** add transform and transform-origin support for rtl ([#11649](https://github.com/ionic-team/ionic/issues/11649)) ([2273fb5](https://github.com/ionic-team/ionic/commit/2273fb5))
+* **rtl:** optimize the new mixins for smaller bundle, ltr separation ([#11635](https://github.com/ionic-team/ionic/issues/11635)) ([f0c6948](https://github.com/ionic-team/ionic/commit/f0c6948))
+* **rtl:** support flipped svg background images on rtl ([#11945](https://github.com/ionic-team/ionic/issues/11945)) ([f4452b5](https://github.com/ionic-team/ionic/commit/f4452b5))
+* **slides:** support centering slides and using decimal numbers ([e3c60c5](https://github.com/ionic-team/ionic/commit/e3c60c5)), closes [#10361](https://github.com/ionic-team/ionic/issues/10361)
+
+
+### Performance Improvements
+
+* **item-sliding:** remove duplicate class ([#11829](https://github.com/ionic-team/ionic/issues/11829)) ([c9cb9ae](https://github.com/ionic-team/ionic/commit/c9cb9ae))
+
+
+
 <a name="3.3.0"></a>
 # [3.3.0](https://github.com/ionic-team/ionic/compare/v3.2.1...v3.3.0) (2017-05-24)
 
diff --git a/demos/src/alert/pages/page-one/page-one.ts b/demos/src/alert/pages/page-one/page-one.ts
index b25f5b177c7..0239fb7bc7e 100644
--- a/demos/src/alert/pages/page-one/page-one.ts
+++ b/demos/src/alert/pages/page-one/page-one.ts
@@ -58,13 +58,13 @@ export class PageOne {
       buttons: [
         {
           text: 'Cancel',
-          handler: (data) => {
+          handler: () => {
             console.log('Cancel clicked');
           }
         },
         {
           text: 'Save',
-          handler: (data) => {
+          handler: () => {
             console.log('Saved clicked');
           }
         }
diff --git a/demos/src/events/app/app.component.ts b/demos/src/events/app/app.component.ts
index ab63e01f35e..8ebde1f6efd 100644
--- a/demos/src/events/app/app.component.ts
+++ b/demos/src/events/app/app.component.ts
@@ -26,7 +26,7 @@ export class AppComponent {
     this.listenToLoginEvents();
   }
 
-  openPage(menu: any, page: any) {
+  openPage(_: any, page: any) {
     // find the nav component and set what the root page should be
     // reset the nav to remove previous pages and only have this page
     // we wouldn't want the back button to show in this scenario
diff --git a/demos/src/item-sliding/pages/page-one/page-one.ts b/demos/src/item-sliding/pages/page-one/page-one.ts
index 0217cd921bf..ab90f27d200 100644
--- a/demos/src/item-sliding/pages/page-one/page-one.ts
+++ b/demos/src/item-sliding/pages/page-one/page-one.ts
@@ -71,7 +71,7 @@ export class PageOne {
     this.expandAction(item, 'downloading', 'Login was downloaded.');
   }
 
-  expandAction(item: ItemSliding, action: string, text: string) {
+  expandAction(item: ItemSliding, _: any, text: string) {
     // TODO item.setElementClass(action, true);
 
     setTimeout(() => {
diff --git a/demos/src/select/pages/page-one/page-one.html b/demos/src/select/pages/page-one/page-one.html
index e8eced2919d..966b571e2f5 100644
--- a/demos/src/select/pages/page-one/page-one.html
+++ b/demos/src/select/pages/page-one/page-one.html
@@ -20,6 +20,13 @@
       </ion-select>
     </ion-item>
 
+    <ion-item>
+      <ion-label>Hair Color</ion-label>
+      <ion-select [(ngModel)]="hairColor" okText="Okay" cancelText="Dismiss" [compareWith]="compareFn">
+        <ion-option *ngFor="let o of hairColorData" [value]="o">{{o.text}}</ion-option>
+      </ion-select>
+    </ion-item>
+
     <ion-item>
       <ion-label>Gaming</ion-label>
       <ion-select [(ngModel)]="gaming" okText="Okay" cancelText="Dismiss">
@@ -147,6 +154,13 @@
       </ion-select>
     </ion-item>
 
+    <ion-item>
+      <ion-label>Skittles</ion-label>
+      <ion-select [(ngModel)]="skittles" multiple="true" okText="Okay" cancelText="Dismiss" [compareWith]="compareFn">
+        <ion-option *ngFor="let o of skittlesData" [value]="o">{{o.text}}</ion-option>
+      </ion-select>
+    </ion-item>
+
     <ion-item>
       <ion-label>Disabled</ion-label>
       <ion-select multiple disabled="true">
diff --git a/demos/src/select/pages/page-one/page-one.ts b/demos/src/select/pages/page-one/page-one.ts
index 48e9ca7950c..e4bcaa81a2e 100644
--- a/demos/src/select/pages/page-one/page-one.ts
+++ b/demos/src/select/pages/page-one/page-one.ts
@@ -10,6 +10,10 @@ export class PageOne {
   petAlertOpts: any;
   petData: any;
   pets: Array<string>;
+  hairColorData: any;
+  hairColor: any;
+  skittlesData: any;
+  skittles: Array<any>;  
   notifications: string = 'mute_1';
   rating: number = 2;
 
@@ -31,9 +35,37 @@ export class PageOne {
       { text: 'Honey Badger', value: 'honeybadger' },
     ];
 
+    this.hairColorData = [
+        { text: 'Brown', value: 'brown' },
+        { text: 'Blonde', value: 'blonde' },
+        { text: 'Black', value: 'black' },
+        { text: 'Red', value: 'red' }
+    ];
+
+    // Pre-selected object with different object reference      
+    this.hairColor = { text: 'Brown', value: 'brown' };
+
+    this.skittlesData = [
+        { text: 'Red', value: 'red' },
+        { text: 'Orange', value: 'orange' },
+        { text: 'Yellow', value: 'yellow' },
+        { text: 'Green', value: 'green' },
+        { text: 'Purple', value: 'purple' }
+    ];
+
+    // Pre-selected object with different object reference      
+    this.skittles = [
+        { text: 'Red', value: 'red' },
+        { text: 'Purple', value: 'purple' }
+    ];
+
     this.pets = ['cat', 'dog'];
   }
 
+  compareFn(option1: any, option2: any) {
+      return option1.value === option2.value;
+  }
+
   monthChange(val: any) {
     console.log('Month Change:', val);
   }
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000000..b901a232679
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,14824 @@
+{
+  "name": "ionic2",
+  "version": "3.5.2",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@angular/common": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.1.3.tgz",
+      "integrity": "sha1-58R5HjITHPdMI5QowqZ9qrLu8Bc="
+    },
+    "@angular/compiler": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.1.3.tgz",
+      "integrity": "sha1-0t0whTsM9KVHWLSjFGMsIx+clMM="
+    },
+    "@angular/compiler-cli": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.1.3.tgz",
+      "integrity": "sha1-wjYv/fZXVkcUgfg5+rZ1vKwhP5Y=",
+      "requires": {
+        "@angular/tsc-wrapped": "4.1.3",
+        "minimist": "1.2.0",
+        "reflect-metadata": "0.1.10"
+      }
+    },
+    "@angular/core": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.1.3.tgz",
+      "integrity": "sha1-KFSY64arfQtvmC+Pn0h+9hABOzU="
+    },
+    "@angular/forms": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.1.3.tgz",
+      "integrity": "sha1-OAq0w6+ExdHXSMKn0EFRx9yOSYI="
+    },
+    "@angular/http": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.1.3.tgz",
+      "integrity": "sha1-650cMCoBcoFfmlczENm+C964Ra4="
+    },
+    "@angular/platform-browser": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.1.3.tgz",
+      "integrity": "sha1-T6HbURndF4sxXdrlsym+4akypb0="
+    },
+    "@angular/platform-browser-dynamic": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.1.3.tgz",
+      "integrity": "sha1-PBP9z1kdSH9u/cHUaRPygMbYwuw="
+    },
+    "@angular/tsc-wrapped": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.1.3.tgz",
+      "integrity": "sha1-LWNyyRh78WIerNlguUs5xPlSk80=",
+      "requires": {
+        "tsickle": "0.21.6"
+      }
+    },
+    "@ionic/app-scripts": {
+      "version": "1.3.12",
+      "resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-1.3.12.tgz",
+      "integrity": "sha512-aPljLGn3ddN3SkMoeO1e8GA9RPaAy9fKzYD5eWEMYygLnp6Zcsxe2lzTvUiwRyHqDC1JwyTJZ43pTwNzbVLlCQ==",
+      "dev": true,
+      "requires": {
+        "autoprefixer": "7.1.1",
+        "babili": "0.1.2",
+        "chalk": "1.1.3",
+        "chokidar": "1.7.0",
+        "clean-css": "3.4.27",
+        "cross-spawn": "5.1.0",
+        "express": "4.15.3",
+        "fs-extra": "2.0.0",
+        "glob": "7.1.1",
+        "json-loader": "0.5.4",
+        "magic-string": "0.19.1",
+        "node-sass": "4.5.3",
+        "os-name": "2.0.1",
+        "postcss": "5.2.17",
+        "proxy-middleware": "0.15.0",
+        "reflect-metadata": "0.1.10",
+        "rollup": "0.42.0",
+        "rollup-plugin-commonjs": "8.0.2",
+        "rollup-plugin-json": "2.3.0",
+        "rollup-plugin-node-builtins": "2.1.2",
+        "rollup-plugin-node-globals": "1.1.0",
+        "rollup-plugin-node-resolve": "3.0.0",
+        "rollup-pluginutils": "2.0.1",
+        "tiny-lr": "1.0.4",
+        "tslint": "5.2.0",
+        "tslint-eslint-rules": "4.1.1",
+        "uglify-js": "2.8.27",
+        "webpack": "2.6.1",
+        "ws": "1.1.1",
+        "xml2js": "0.4.17"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz",
+          "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "fs-extra": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.0.0.tgz",
+          "integrity": "sha1-M3NSve1KC3FPPrhN6M6nZenTdgA=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+          "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
+          "dev": true,
+          "requires": {
+            "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-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "rollup": {
+          "version": "0.42.0",
+          "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.42.0.tgz",
+          "integrity": "sha1-VueRs6Lz3XGQu7gKN1Z18v4PmyM=",
+          "dev": true,
+          "requires": {
+            "source-map-support": "0.4.15"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        },
+        "tslint": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.2.0.tgz",
+          "integrity": "sha1-FqKt3yDLdIOF9UTpoO2rCGvDQRQ=",
+          "dev": true,
+          "requires": {
+            "babel-code-frame": "6.22.0",
+            "colors": "1.1.2",
+            "diff": "3.3.0",
+            "findup-sync": "0.3.0",
+            "glob": "7.1.1",
+            "optimist": "0.6.1",
+            "resolve": "1.3.3",
+            "semver": "5.3.0",
+            "tslib": "1.7.1",
+            "tsutils": "1.9.1"
+          }
+        },
+        "webpack": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz",
+          "integrity": "sha1-LgRX8KuxrF3zqxBsacZy8jZ4Xwc=",
+          "dev": true,
+          "requires": {
+            "acorn": "5.1.1",
+            "acorn-dynamic-import": "2.0.2",
+            "ajv": "4.11.8",
+            "ajv-keywords": "1.5.1",
+            "async": "2.5.0",
+            "enhanced-resolve": "3.3.0",
+            "interpret": "1.0.3",
+            "json-loader": "0.5.4",
+            "json5": "0.5.1",
+            "loader-runner": "2.3.0",
+            "loader-utils": "0.2.17",
+            "memory-fs": "0.4.1",
+            "mkdirp": "0.5.1",
+            "node-libs-browser": "2.0.0",
+            "source-map": "0.5.6",
+            "supports-color": "3.2.3",
+            "tapable": "0.2.6",
+            "uglify-js": "2.8.27",
+            "watchpack": "1.3.1",
+            "webpack-sources": "0.2.3",
+            "yargs": "6.6.0"
+          }
+        },
+        "yargs": {
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
+          "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
+          "dev": true,
+          "requires": {
+            "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": "4.2.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
+          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+          "dev": true,
+          "requires": {
+            "camelcase": "3.0.0"
+          }
+        }
+      }
+    },
+    "@ionic/commit-hooks": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@ionic/commit-hooks/-/commit-hooks-1.0.3.tgz",
+      "integrity": "sha1-UPJS4Y3CPHdDYzVIweHYZRkqyjg=",
+      "dev": true,
+      "requires": {
+        "git-validate": "2.2.2"
+      }
+    },
+    "@types/connect": {
+      "version": "3.4.30",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.30.tgz",
+      "integrity": "sha1-Co7eMJzg69ui8FNOV0aSUR3XHrY=",
+      "dev": true,
+      "requires": {
+        "@types/node": "6.0.83"
+      }
+    },
+    "@types/del": {
+      "version": "2.2.31",
+      "resolved": "https://registry.npmjs.org/@types/del/-/del-2.2.31.tgz",
+      "integrity": "sha1-r8ShTVgE4jpQVf4tBEuPRn/0gnU=",
+      "dev": true,
+      "requires": {
+        "@types/glob": "5.0.30"
+      }
+    },
+    "@types/express-serve-static-core": {
+      "version": "4.0.49",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.49.tgz",
+      "integrity": "sha512-b7mVHoURu1xaP/V6xw1sYwyv9V0EZ7euyi+sdnbnTZxEkAh4/hzPsI6Eflq+ZzHQ/Tgl7l16Jz+0oz8F46MLnA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "6.0.83"
+      }
+    },
+    "@types/fs-extra": {
+      "version": "0.0.37",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-0.0.37.tgz",
+      "integrity": "sha1-GV8RvNmhuX2eQSxrZombVFRxofc=",
+      "dev": true,
+      "requires": {
+        "@types/node": "6.0.83"
+      }
+    },
+    "@types/glob": {
+      "version": "5.0.30",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.30.tgz",
+      "integrity": "sha1-ECZAnFYlqGiQdGAoCNCCsoZ7ilE=",
+      "dev": true,
+      "requires": {
+        "@types/minimatch": "2.0.29",
+        "@types/node": "6.0.83"
+      }
+    },
+    "@types/gulp": {
+      "version": "3.8.32",
+      "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-3.8.32.tgz",
+      "integrity": "sha1-g8WcaBzCM9Hsf4LSaVVVZvoTMVY=",
+      "dev": true,
+      "requires": {
+        "@types/node": "6.0.83",
+        "@types/orchestrator": "0.3.0",
+        "@types/vinyl": "2.0.0"
+      }
+    },
+    "@types/gulp-watch": {
+      "version": "4.1.29",
+      "resolved": "https://registry.npmjs.org/@types/gulp-watch/-/gulp-watch-4.1.29.tgz",
+      "integrity": "sha1-P+Cy9g/QR+/1gijqE5TTXV30a3E=",
+      "dev": true,
+      "requires": {
+        "@types/node": "6.0.83"
+      }
+    },
+    "@types/hammerjs": {
+      "version": "2.0.33",
+      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.33.tgz",
+      "integrity": "sha1-RfVzUkdBgUJbtLZfcxOmBCbVS6s=",
+      "dev": true
+    },
+    "@types/jasmine": {
+      "version": "2.2.34",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.2.34.tgz",
+      "integrity": "sha1-QVbV+OpZ3Crbbl8h4JroDxkJBQU=",
+      "dev": true
+    },
+    "@types/lodash": {
+      "version": "4.14.35",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.35.tgz",
+      "integrity": "sha1-2iDcCej8Jm6k8NzlnR0HARnbR4o=",
+      "dev": true
+    },
+    "@types/merge2": {
+      "version": "0.3.29",
+      "resolved": "https://registry.npmjs.org/@types/merge2/-/merge2-0.3.29.tgz",
+      "integrity": "sha1-y1UumCbKPAjZ5lSd6ezY8VQX8G0=",
+      "dev": true,
+      "requires": {
+        "@types/node": "6.0.83"
+      }
+    },
+    "@types/mime": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.1.tgz",
+      "integrity": "sha512-rek8twk9C58gHYqIrUlJsx8NQMhlxqHzln9Z9ODqiNgv3/s+ZwIrfr+djqzsnVM12xe9hL98iJ20lj2RvCBv6A==",
+      "dev": true
+    },
+    "@types/minimatch": {
+      "version": "2.0.29",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-2.0.29.tgz",
+      "integrity": "sha1-UALhT3Xi1x5WQoHfBDHIwbSio2o=",
+      "dev": true
+    },
+    "@types/mkdirp": {
+      "version": "0.3.29",
+      "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.3.29.tgz",
+      "integrity": "sha1-fyrX7FX5FEgvybHsS7GuYCjUYGY=",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "6.0.83",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.83.tgz",
+      "integrity": "sha512-Q92+tkWnX7nmT0ZG+/wFxzJr+idr00T12MgsY3p0sZIu8nfvYF8i5pbY3BVZw6ad6yS2MLF71sfMr+ySatc2Gw==",
+      "dev": true
+    },
+    "@types/orchestrator": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@types/orchestrator/-/orchestrator-0.3.0.tgz",
+      "integrity": "sha1-v4ShaZyTMNT+ic2BJj6PwJ+zKXg=",
+      "dev": true,
+      "requires": {
+        "@types/node": "6.0.83",
+        "@types/q": "0.0.35"
+      }
+    },
+    "@types/protractor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/protractor/-/protractor-4.0.0.tgz",
+      "integrity": "sha1-EZFYRbONSD9wYNdOyOLu7kNXOZk=",
+      "dev": true,
+      "requires": {
+        "protractor": "5.1.2"
+      }
+    },
+    "@types/q": {
+      "version": "0.0.35",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.35.tgz",
+      "integrity": "sha512-Br6c/XFnnYBSOGKadEaXruA71rpUMxMzlSrGmhpoIEWrqRMI/yQjrY+0ORJi52m/JgkxRqatdBJ32fQ/95qtbw==",
+      "dev": true
+    },
+    "@types/run-sequence": {
+      "version": "0.0.28",
+      "resolved": "https://registry.npmjs.org/@types/run-sequence/-/run-sequence-0.0.28.tgz",
+      "integrity": "sha1-EX7IMNdDTlGftA/JpQ6gNUlFPjA=",
+      "dev": true,
+      "requires": {
+        "@types/gulp": "3.8.32",
+        "@types/node": "6.0.83"
+      }
+    },
+    "@types/selenium-webdriver": {
+      "version": "2.53.42",
+      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-2.53.42.tgz",
+      "integrity": "sha1-dMt3+2BS7a/yqJhN2v2I1BnyXKw=",
+      "dev": true
+    },
+    "@types/semver": {
+      "version": "5.3.30",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.3.30.tgz",
+      "integrity": "sha1-tVo70HtrizX51EcuH8Mxi2ikk7I=",
+      "dev": true
+    },
+    "@types/serve-static": {
+      "version": "1.7.31",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.7.31.tgz",
+      "integrity": "sha1-FUVt6NmNa0z/Mb5savdJKuY/Uho=",
+      "dev": true,
+      "requires": {
+        "@types/express-serve-static-core": "4.0.49",
+        "@types/mime": "1.3.1"
+      }
+    },
+    "@types/systemjs": {
+      "version": "0.19.33",
+      "resolved": "https://registry.npmjs.org/@types/systemjs/-/systemjs-0.19.33.tgz",
+      "integrity": "sha1-R8R+djmGe2aUvrP2DE9TrVXrGxM=",
+      "dev": true
+    },
+    "@types/through2": {
+      "version": "2.0.29",
+      "resolved": "https://registry.npmjs.org/@types/through2/-/through2-2.0.29.tgz",
+      "integrity": "sha1-abK91NNhjIoSY7i6p2ObLDDtgn4=",
+      "dev": true,
+      "requires": {
+        "@types/node": "6.0.83"
+      }
+    },
+    "@types/vinyl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.0.tgz",
+      "integrity": "sha1-/SE79/QTbd4h/hiVUAsSwYb4wmg=",
+      "dev": true,
+      "requires": {
+        "@types/node": "6.0.83"
+      }
+    },
+    "abbrev": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
+      "dev": true
+    },
+    "abstract-leveldown": {
+      "version": "0.12.4",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz",
+      "integrity": "sha1-KeGOYy5g5OIh1YECR4UqY9ey5BA=",
+      "dev": true,
+      "requires": {
+        "xtend": "3.0.0"
+      },
+      "dependencies": {
+        "xtend": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
+          "dev": true
+        }
+      }
+    },
+    "accepts": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
+      "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
+      "dev": true,
+      "requires": {
+        "mime-types": "2.1.15",
+        "negotiator": "0.6.1"
+      }
+    },
+    "acorn": {
+      "version": "4.0.13",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+      "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+      "dev": true
+    },
+    "acorn-dynamic-import": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
+      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+      "dev": true,
+      "requires": {
+        "acorn": "4.0.13"
+      }
+    },
+    "add-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
+      "integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
+      "dev": true
+    },
+    "adm-zip": {
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz",
+      "integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=",
+      "dev": true
+    },
+    "after": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.1.tgz",
+      "integrity": "sha1-q11PuIP1loFtNRX495HAr0ht1ic=",
+      "dev": true
+    },
+    "agent-base": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
+      "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
+      "dev": true,
+      "requires": {
+        "extend": "3.0.1",
+        "semver": "5.0.3"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
+          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
+          "dev": true
+        }
+      }
+    },
+    "ajv": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+      "dev": true,
+      "requires": {
+        "co": "4.6.0",
+        "json-stable-stringify": "1.0.1"
+      }
+    },
+    "ajv-keywords": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
+      "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
+      "dev": true
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2",
+        "longest": "1.0.1",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "ansi-align": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
+      "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
+      "dev": true,
+      "requires": {
+        "string-width": "2.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz",
+          "integrity": "sha1-AwZkVh/BRslCPsfZeP4kV0N/5tA=",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        }
+      }
+    },
+    "ansi-escapes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+      "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz",
+      "integrity": "sha1-CcIC1ckX7CMYjKpcnLkXnNlUd1A=",
+      "dev": true,
+      "requires": {
+        "color-convert": "1.9.0"
+      }
+    },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
+    },
+    "any-shell-escape": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/any-shell-escape/-/any-shell-escape-0.1.1.tgz",
+      "integrity": "sha1-1Vq5ciRMcaml4asIefML8RCAaVk=",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
+      "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "micromatch": "2.3.11"
+      }
+    },
+    "aproba": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
+      "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==",
+      "dev": true
+    },
+    "archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+      "dev": true
+    },
+    "are-we-there-yet": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+      "dev": true,
+      "requires": {
+        "delegates": "1.0.0",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "1.0.3"
+      }
+    },
+    "arr-diff": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "1.1.0"
+      }
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-differ": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
+      "dev": true
+    },
+    "array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+      "dev": true
+    },
+    "array-ify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
+      "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=",
+      "dev": true
+    },
+    "array-slice": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz",
+      "integrity": "sha1-5zA08A3MH0CHYAj9IP6ud71LfC8=",
+      "dev": true
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "1.0.3"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+      "dev": true
+    },
+    "arraybuffer.slice": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
+      "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "dev": true
+    },
+    "asn1.js": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz",
+      "integrity": "sha1-SLokC0WpKA6UdImQull9IWYX/UA=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.7",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "requires": {
+        "util": "0.10.3"
+      }
+    },
+    "assert-plus": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+      "dev": true
+    },
+    "async": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
+      "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "async-array-reduce": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/async-array-reduce/-/async-array-reduce-0.2.1.tgz",
+      "integrity": "sha1-yL4BCitc0A3qlsgRFgNGk9/dgtE=",
+      "dev": true
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "dev": true
+    },
+    "async-foreach": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "autoprefixer": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.1.tgz",
+      "integrity": "sha1-l7yFTH0Ll5+NZIneVHoNF/swf20=",
+      "dev": true,
+      "requires": {
+        "browserslist": "2.1.5",
+        "caniuse-lite": "1.0.30000701",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "6.0.6",
+        "postcss-value-parser": "3.3.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
+          "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.1.0",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "4.2.0"
+          }
+        },
+        "postcss": {
+          "version": "6.0.6",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz",
+          "integrity": "sha1-u6TVjohPx4yEDRU54Q7dqruPc70=",
+          "dev": true,
+          "requires": {
+            "chalk": "2.0.1",
+            "source-map": "0.5.6",
+            "supports-color": "4.2.0"
+          }
+        }
+      }
+    },
+    "aws-sdk": {
+      "version": "2.0.31",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.31.tgz",
+      "integrity": "sha1-5yzx/caQFb2f0r3z07iMFlB9Jo4=",
+      "dev": true,
+      "requires": {
+        "xml2js": "0.2.6",
+        "xmlbuilder": "0.4.2"
+      },
+      "dependencies": {
+        "sax": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.4.2.tgz",
+          "integrity": "sha1-OfO2AXM9a+yXEFskKipA/Wl4rDw=",
+          "dev": true
+        },
+        "xml2js": {
+          "version": "0.2.6",
+          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.6.tgz",
+          "integrity": "sha1-0gnE5N2h/JxFIUHvQcB39a399sQ=",
+          "dev": true,
+          "requires": {
+            "sax": "0.4.2"
+          }
+        },
+        "xmlbuilder": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz",
+          "integrity": "sha1-F3bWXz/brUcKCNhgTN6xxOVA/4M=",
+          "dev": true
+        }
+      }
+    },
+    "aws-sign2": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+      "dev": true
+    },
+    "babel-cli": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.24.1.tgz",
+      "integrity": "sha1-IHzXBbumFImy6kG1MSNBz2rKIoM=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.25.0",
+        "babel-polyfill": "6.23.0",
+        "babel-register": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "chokidar": "1.7.0",
+        "commander": "2.11.0",
+        "convert-source-map": "1.5.0",
+        "fs-readdir-recursive": "1.0.0",
+        "glob": "7.0.6",
+        "lodash": "4.17.4",
+        "output-file-sync": "1.1.2",
+        "path-is-absolute": "1.0.1",
+        "slash": "1.0.0",
+        "source-map": "0.5.6",
+        "v8flags": "2.1.1"
+      }
+    },
+    "babel-code-frame": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
+      "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
+      }
+    },
+    "babel-core": {
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz",
+      "integrity": "sha1-fdQrBGPHQunVKW3rPsZ6kyLa1yk=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.22.0",
+        "babel-generator": "6.25.0",
+        "babel-helpers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-register": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0",
+        "babel-traverse": "6.25.0",
+        "babel-types": "6.25.0",
+        "babylon": "6.17.4",
+        "convert-source-map": "1.5.0",
+        "debug": "2.6.8",
+        "json5": "0.5.1",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4",
+        "path-is-absolute": "1.0.1",
+        "private": "0.1.7",
+        "slash": "1.0.0",
+        "source-map": "0.5.6"
+      }
+    },
+    "babel-generator": {
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz",
+      "integrity": "sha1-M6GvcNXyiQrrRlpKd5PB32qeqfw=",
+      "dev": true,
+      "requires": {
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0",
+        "detect-indent": "4.0.0",
+        "jsesc": "1.3.0",
+        "lodash": "4.17.4",
+        "source-map": "0.5.6",
+        "trim-right": "1.0.1"
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-traverse": "6.25.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-helper-define-map": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz",
+      "integrity": "sha1-epdH8ljYlH0y1RX2qhx70CIEoIA=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-helper-evaluate-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.1.0.tgz",
+      "integrity": "sha1-ldmMTqNhUEg9sufT7J4ZVKcmKcs=",
+      "dev": true
+    },
+    "babel-helper-flip-expressions": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.1.2.tgz",
+      "integrity": "sha1-d/ZlL53pxCQB2Ce9RuvSEJ4+8Yo=",
+      "dev": true
+    },
+    "babel-helper-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "dev": true,
+      "requires": {
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0",
+        "babel-traverse": "6.25.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-helper-is-nodes-equiv": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz",
+      "integrity": "sha1-NOmzALFHnd2Y7HfqC76TQt/jloQ=",
+      "dev": true
+    },
+    "babel-helper-is-void-0": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-is-void-0/-/babel-helper-is-void-0-0.1.1.tgz",
+      "integrity": "sha1-cvIaOrugvvODf5F0/KcxrtmgKIg=",
+      "dev": true
+    },
+    "babel-helper-mark-eval-scopes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.1.1.tgz",
+      "integrity": "sha1-RVQ0Xt+fJUlCe9IJjlMCU/ivKZI=",
+      "dev": true
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-helper-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz",
+      "integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-helper-remove-or-void": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.1.1.tgz",
+      "integrity": "sha1-nX4YVtxvr8tBsoOkFnMNwYRPZtc=",
+      "dev": true
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "dev": true,
+      "requires": {
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0",
+        "babel-traverse": "6.25.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-helper-to-multiple-sequence-expressions": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.1.1.tgz",
+      "integrity": "sha1-XxuDKznkrPlU6RN/AlE5XHEZazU=",
+      "dev": true
+    },
+    "babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0"
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-minify-builtins": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.1.3.tgz",
+      "integrity": "sha1-TyGn3LUfkaBOpx1H/w6OOwX+wCE=",
+      "dev": true,
+      "requires": {
+        "babel-helper-evaluate-path": "0.1.0"
+      }
+    },
+    "babel-plugin-minify-constant-folding": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.1.3.tgz",
+      "integrity": "sha1-V70XKt+LjXStfJlhLrlQQU6+o8o=",
+      "dev": true,
+      "requires": {
+        "babel-helper-evaluate-path": "0.1.0"
+      }
+    },
+    "babel-plugin-minify-dead-code-elimination": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.1.7.tgz",
+      "integrity": "sha1-d09TbzR7mDk6J7qnF4cpaIE8NCw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-mark-eval-scopes": "0.1.1",
+        "babel-helper-remove-or-void": "0.1.1",
+        "lodash.some": "4.6.0"
+      }
+    },
+    "babel-plugin-minify-flip-comparisons": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.1.2.tgz",
+      "integrity": "sha1-4oa0C3WZsY3+oZUHHkJ5Rlz8GIQ=",
+      "dev": true,
+      "requires": {
+        "babel-helper-is-void-0": "0.1.1"
+      }
+    },
+    "babel-plugin-minify-guarded-expressions": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.1.2.tgz",
+      "integrity": "sha1-38PUc7A2LZYF084KweIjKMYNEAc=",
+      "dev": true,
+      "requires": {
+        "babel-helper-flip-expressions": "0.1.2"
+      }
+    },
+    "babel-plugin-minify-infinity": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.1.2.tgz",
+      "integrity": "sha1-Xxz2fd7cuhPIoA2oMlQt8AkaHNQ=",
+      "dev": true
+    },
+    "babel-plugin-minify-mangle-names": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.1.3.tgz",
+      "integrity": "sha1-v6JGYaZ5T7A4M1h+VYKLZUSeBv4=",
+      "dev": true,
+      "requires": {
+        "babel-helper-mark-eval-scopes": "0.1.1"
+      }
+    },
+    "babel-plugin-minify-numeric-literals": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.1.1.tgz",
+      "integrity": "sha1-1LiwySX4dHFO4z7ksmZ4WD185/s=",
+      "dev": true
+    },
+    "babel-plugin-minify-replace": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.1.2.tgz",
+      "integrity": "sha1-uQuecatNOzYyVimpG+q+E7CxasE=",
+      "dev": true
+    },
+    "babel-plugin-minify-simplify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.1.2.tgz",
+      "integrity": "sha1-qWjxZY/esvx1noH+Mx2Jgp3w9rk=",
+      "dev": true,
+      "requires": {
+        "babel-helper-flip-expressions": "0.1.2",
+        "babel-helper-is-nodes-equiv": "0.0.1",
+        "babel-helper-to-multiple-sequence-expressions": "0.1.1"
+      }
+    },
+    "babel-plugin-minify-type-constructors": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.1.2.tgz",
+      "integrity": "sha1-21PFt2y44vzUXYYvFxBMeHYTN+4=",
+      "dev": true,
+      "requires": {
+        "babel-helper-is-void-0": "0.1.1"
+      }
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz",
+      "integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0",
+        "babel-traverse": "6.25.0",
+        "babel-types": "6.25.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-define-map": "6.24.1",
+        "babel-helper-function-name": "6.24.1",
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0",
+        "babel-traverse": "6.25.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0"
+      }
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
+      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-commonjs": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz",
+      "integrity": "sha1-0+MQtA72ZKNmIiAAl8bUQCmPK/4=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-strict-mode": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.14.0.tgz",
+      "integrity": "sha1-xRm1xz4yOI5nnJse30Gy/CPcMwM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
+      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0"
+      }
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "dev": true,
+      "requires": {
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "dev": true,
+      "requires": {
+        "babel-helper-call-delegate": "6.24.1",
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0",
+        "babel-traverse": "6.25.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "regexpu-core": "2.0.0"
+      }
+    },
+    "babel-plugin-transform-inline-consecutive-adds": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.1.2.tgz",
+      "integrity": "sha1-VELp8cGceKeJn4pN7m/UgfYQAfU=",
+      "dev": true
+    },
+    "babel-plugin-transform-member-expression-literals": {
+      "version": "6.8.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.8.4.tgz",
+      "integrity": "sha1-BWebxAWWuRKTQBlZqhYgqxsr5Dc=",
+      "dev": true
+    },
+    "babel-plugin-transform-merge-sibling-variables": {
+      "version": "6.8.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.8.5.tgz",
+      "integrity": "sha1-A6vfEHxhJBkT6yaN3t5tW8VBhiw=",
+      "dev": true
+    },
+    "babel-plugin-transform-minify-booleans": {
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.8.2.tgz",
+      "integrity": "sha1-hFFXn3BucCweGrJ1beXI6jac8Hw=",
+      "dev": true
+    },
+    "babel-plugin-transform-property-literals": {
+      "version": "6.8.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.8.4.tgz",
+      "integrity": "sha1-atMREQuAoZKlbvtd30/jym96Ydo=",
+      "dev": true,
+      "requires": {
+        "esutils": "2.0.2"
+      }
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz",
+      "integrity": "sha1-uNowWtQ8PJm0hI5P5AN7dw0jxBg=",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "0.9.11"
+      }
+    },
+    "babel-plugin-transform-regexp-constructors": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.1.1.tgz",
+      "integrity": "sha1-MSq3SHzIihxi7iXqG2CH6JuHeZw=",
+      "dev": true
+    },
+    "babel-plugin-transform-remove-console": {
+      "version": "6.8.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.8.4.tgz",
+      "integrity": "sha1-Qf3awZpymkw91+8pZOrAewlvmo8=",
+      "dev": true
+    },
+    "babel-plugin-transform-remove-debugger": {
+      "version": "6.8.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.8.4.tgz",
+      "integrity": "sha1-+FcEoIrapxtV13AFtblOm53yH24=",
+      "dev": true
+    },
+    "babel-plugin-transform-remove-undefined": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.1.2.tgz",
+      "integrity": "sha1-4ev1ERD2seBmXyg4Lvc/leUCNlI=",
+      "dev": true
+    },
+    "babel-plugin-transform-simplify-comparison-operators": {
+      "version": "6.8.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.8.4.tgz",
+      "integrity": "sha1-KqJKJi1mTIyz4SWjBseY16LeCNU=",
+      "dev": true
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0"
+      }
+    },
+    "babel-plugin-transform-undefined-to-void": {
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.8.2.tgz",
+      "integrity": "sha1-/isdKU6wXodSTrk3JN6m4sPWb6E=",
+      "dev": true
+    },
+    "babel-polyfill": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz",
+      "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "core-js": "2.4.1",
+        "regenerator-runtime": "0.10.5"
+      }
+    },
+    "babel-preset-babili": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/babel-preset-babili/-/babel-preset-babili-0.1.4.tgz",
+      "integrity": "sha1-rZ1mUQAvW8PwfKswB4EWf1RyS/I=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-minify-builtins": "0.1.3",
+        "babel-plugin-minify-constant-folding": "0.1.3",
+        "babel-plugin-minify-dead-code-elimination": "0.1.7",
+        "babel-plugin-minify-flip-comparisons": "0.1.2",
+        "babel-plugin-minify-guarded-expressions": "0.1.2",
+        "babel-plugin-minify-infinity": "0.1.2",
+        "babel-plugin-minify-mangle-names": "0.1.3",
+        "babel-plugin-minify-numeric-literals": "0.1.1",
+        "babel-plugin-minify-replace": "0.1.2",
+        "babel-plugin-minify-simplify": "0.1.2",
+        "babel-plugin-minify-type-constructors": "0.1.2",
+        "babel-plugin-transform-inline-consecutive-adds": "0.1.2",
+        "babel-plugin-transform-member-expression-literals": "6.8.4",
+        "babel-plugin-transform-merge-sibling-variables": "6.8.5",
+        "babel-plugin-transform-minify-booleans": "6.8.2",
+        "babel-plugin-transform-property-literals": "6.8.4",
+        "babel-plugin-transform-regexp-constructors": "0.1.1",
+        "babel-plugin-transform-remove-console": "6.8.4",
+        "babel-plugin-transform-remove-debugger": "6.8.4",
+        "babel-plugin-transform-remove-undefined": "0.1.2",
+        "babel-plugin-transform-simplify-comparison-operators": "6.8.4",
+        "babel-plugin-transform-undefined-to-void": "6.8.2",
+        "lodash.isplainobject": "4.0.6"
+      }
+    },
+    "babel-preset-es2015": {
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.16.0.tgz",
+      "integrity": "sha1-Wazs0e++uvSPiUBIQPL+eMTSrVw=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.24.1",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.14.0",
+        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.24.1"
+      }
+    },
+    "babel-register": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz",
+      "integrity": "sha1-fhDhOi9xBlvfrVoXh7pFvKbe118=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.25.0",
+        "babel-runtime": "6.23.0",
+        "core-js": "2.4.1",
+        "home-or-tmp": "2.0.0",
+        "lodash": "4.17.4",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.15"
+      }
+    },
+    "babel-runtime": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+      "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
+      "dev": true,
+      "requires": {
+        "core-js": "2.4.1",
+        "regenerator-runtime": "0.10.5"
+      }
+    },
+    "babel-template": {
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz",
+      "integrity": "sha1-ZlJBFmt8KqTGGdceGSlpVSsQwHE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-traverse": "6.25.0",
+        "babel-types": "6.25.0",
+        "babylon": "6.17.4",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-traverse": {
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz",
+      "integrity": "sha1-IldJfi/NGbie3BPEyROB+VEklvE=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.22.0",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0",
+        "babylon": "6.17.4",
+        "debug": "2.6.8",
+        "globals": "9.18.0",
+        "invariant": "2.2.2",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-types": {
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz",
+      "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.4",
+        "to-fast-properties": "1.0.3"
+      }
+    },
+    "babili": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/babili/-/babili-0.1.2.tgz",
+      "integrity": "sha1-dyMbOXcnI5SGOTbLiL97rydvl/U=",
+      "dev": true,
+      "requires": {
+        "babel-cli": "6.24.1",
+        "babel-preset-babili": "0.1.4"
+      }
+    },
+    "babylon": {
+      "version": "6.17.4",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz",
+      "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw==",
+      "dev": true
+    },
+    "backo2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base64-arraybuffer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz",
+      "integrity": "sha1-R030qfLaJOBd8xWMOx2zw81GoVQ=",
+      "dev": true
+    },
+    "base64-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
+      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==",
+      "dev": true
+    },
+    "base64-url": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz",
+      "integrity": "sha1-GZ/WYXAqDnt9yubgaYuwicUvbXg=",
+      "dev": true
+    },
+    "base64id": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz",
+      "integrity": "sha1-As4P3u4M709ACA4ec+g08LG/zj8=",
+      "dev": true
+    },
+    "basic-auth": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz",
+      "integrity": "sha1-Awk1sB3nyblKgksp8/zLdQ06UpA=",
+      "dev": true
+    },
+    "basic-auth-connect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz",
+      "integrity": "sha1-/bC0OWLKe0BFanwrtI/hc9otISI=",
+      "dev": true
+    },
+    "batch": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz",
+      "integrity": "sha1-PzQU84AyF0O/wQQvmoP/HVgk1GQ=",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "beeper": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
+      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
+      "dev": true
+    },
+    "benchmark": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz",
+      "integrity": "sha1-Lx4vpMNZ8REiqhgwgiGOlX45DHM=",
+      "dev": true
+    },
+    "better-assert": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
+      "dev": true,
+      "requires": {
+        "callsite": "1.0.0"
+      }
+    },
+    "big.js": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz",
+      "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg=",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz",
+      "integrity": "sha1-SOyNFt9Dd+rl+liEaCSAr02Vx3Q=",
+      "dev": true
+    },
+    "bl": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
+      "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.0.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "0.10.31",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "blob": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
+      "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=",
+      "dev": true
+    },
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "blocking-proxy": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-0.0.5.tgz",
+      "integrity": "sha1-RikF4Nz76pcPQao3Ij3anAexkSs=",
+      "dev": true,
+      "requires": {
+        "minimist": "1.2.0"
+      }
+    },
+    "bluebird": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
+      "dev": true
+    },
+    "bn.js": {
+      "version": "4.11.7",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz",
+      "integrity": "sha512-LxFiV5mefv0ley0SzqkOPR1bC4EbpPx8LkOz5vMe/Yi15t5hzwgO/G+tc7wOtL4PZTYjwHu8JnEiSLumuSjSfA==",
+      "dev": true
+    },
+    "body": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+      "dev": true,
+      "requires": {
+        "continuable-cache": "0.3.1",
+        "error": "7.0.2",
+        "raw-body": "1.1.7",
+        "safe-json-parse": "1.0.1"
+      }
+    },
+    "body-parser": {
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz",
+      "integrity": "sha1-wIzzMMM1jhUQFqBXRvE/ApyX+pc=",
+      "dev": true,
+      "requires": {
+        "bytes": "2.1.0",
+        "content-type": "1.0.2",
+        "debug": "2.2.0",
+        "depd": "1.0.1",
+        "http-errors": "1.3.1",
+        "iconv-lite": "0.4.11",
+        "on-finished": "2.3.0",
+        "qs": "4.0.0",
+        "raw-body": "2.1.7",
+        "type-is": "1.6.15"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz",
+          "integrity": "sha1-rJPEEOL/ycx89LRks4KJBn9eR7Q=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "depd": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz",
+          "integrity": "sha1-gK7GTJ1tl+ZcwqnKqTwKpqv3Oqo=",
+          "dev": true
+        },
+        "http-errors": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz",
+          "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "statuses": "1.3.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        },
+        "qs": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz",
+          "integrity": "sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc=",
+          "dev": true
+        },
+        "raw-body": {
+          "version": "2.1.7",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz",
+          "integrity": "sha1-rf6s4uT7MJgFgBTQjActzFl1h3Q=",
+          "dev": true,
+          "requires": {
+            "bytes": "2.4.0",
+            "iconv-lite": "0.4.13",
+            "unpipe": "1.0.0"
+          },
+          "dependencies": {
+            "bytes": {
+              "version": "2.4.0",
+              "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
+              "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=",
+              "dev": true
+            },
+            "iconv-lite": {
+              "version": "0.4.13",
+              "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz",
+              "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "boom": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "dev": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "boxen": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.2.0.tgz",
+      "integrity": "sha512-tfKK3nq0qXXOxvXEYW1k1XNRrDuQzO2oFPvLD3Fs1I58n0leuTNlftBmu3seUCyZvDfiqgRaxlqZs9WJAbSA7g==",
+      "dev": true,
+      "requires": {
+        "ansi-align": "2.0.0",
+        "camelcase": "4.1.0",
+        "chalk": "2.0.1",
+        "cli-boxes": "1.0.0",
+        "string-width": "2.1.0",
+        "term-size": "1.2.0",
+        "widest-line": "1.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
+          "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.1.0",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "4.2.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz",
+          "integrity": "sha1-AwZkVh/BRslCPsfZeP4kV0N/5tA=",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        }
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+      "dev": true,
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "dev": true,
+      "requires": {
+        "expand-range": "1.8.2",
+        "preserve": "0.2.0",
+        "repeat-element": "1.1.2"
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browser-resolve": {
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz",
+      "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=",
+      "dev": true,
+      "requires": {
+        "resolve": "1.1.7"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+          "dev": true
+        }
+      }
+    },
+    "browserify-aes": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz",
+      "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "1.0.3",
+        "cipher-base": "1.0.4",
+        "create-hash": "1.1.3",
+        "evp_bytestokey": "1.0.0",
+        "inherits": "2.0.3"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
+      "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "1.0.6",
+        "browserify-des": "1.0.0",
+        "evp_bytestokey": "1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
+      "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.4",
+        "des.js": "1.0.0",
+        "inherits": "2.0.3"
+      }
+    },
+    "browserify-fs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browserify-fs/-/browserify-fs-1.0.0.tgz",
+      "integrity": "sha1-8HWqinKdTRcW0GZiDjhvzBMRqW8=",
+      "dev": true,
+      "requires": {
+        "level-filesystem": "1.2.0",
+        "level-js": "2.2.4",
+        "levelup": "0.18.6"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.7",
+        "randombytes": "2.0.5"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.7",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.1.3",
+        "create-hmac": "1.1.6",
+        "elliptic": "6.4.0",
+        "inherits": "2.0.3",
+        "parse-asn1": "5.1.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+      "dev": true,
+      "requires": {
+        "pako": "0.2.9"
+      }
+    },
+    "browserslist": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.1.5.tgz",
+      "integrity": "sha1-6IJVDfPRzW1IHBo+ADjyuvE6RxE=",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "1.0.30000701",
+        "electron-to-chromium": "1.3.15"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
+      "requires": {
+        "base64-js": "1.2.1",
+        "ieee754": "1.1.8",
+        "isarray": "1.0.0"
+      }
+    },
+    "buffer-es6": {
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/buffer-es6/-/buffer-es6-4.9.3.tgz",
+      "integrity": "sha1-8mNHuC33b9N+GLy1KIxJcM/VxAQ=",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "bufferstreams": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz",
+      "integrity": "sha1-z7GtlWjTujz+k1upq92VLeiKqyo=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "1.1.14"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "bytes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+      "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
+      "dev": true
+    },
+    "callsite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
+      "dev": true
+    },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.1",
+        "upper-case": "1.1.3"
+      }
+    },
+    "camelcase": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
+      }
+    },
+    "caniuse-db": {
+      "version": "1.0.30000701",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000701.tgz",
+      "integrity": "sha1-LjKwaZO/Pb2QtD2T8E4m0Rr93Lo=",
+      "dev": true
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000701",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000701.tgz",
+      "integrity": "sha1-nWc89rdNyz1cIdITF2sBGsakW6o=",
+      "dev": true
+    },
+    "canonical-path": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-0.0.2.tgz",
+      "integrity": "sha1-4x65N6jJPuKgHfGDl5RyGQKHRXQ=",
+      "dev": true
+    },
+    "capture-stack-trace": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
+      "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+      "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
+      "dev": true
+    },
+    "catharsis": {
+      "version": "0.8.9",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz",
+      "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=",
+      "dev": true,
+      "requires": {
+        "underscore-contrib": "0.3.0"
+      }
+    },
+    "cdocparser": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/cdocparser/-/cdocparser-0.13.0.tgz",
+      "integrity": "sha1-G6mKHh4WaOK/s11Bdh6eRkXXMbo=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5",
+        "lodash.assign": "2.4.1",
+        "strip-indent": "1.0.1"
+      },
+      "dependencies": {
+        "lodash.assign": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-2.4.1.tgz",
+          "integrity": "sha1-hMOVlt1xGBqXsGUpE6fJZ15Jsao=",
+          "dev": true,
+          "requires": {
+            "lodash._basecreatecallback": "2.4.1",
+            "lodash._objecttypes": "2.4.1",
+            "lodash.keys": "2.4.1"
+          }
+        },
+        "lodash.keys": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
+          "dev": true,
+          "requires": {
+            "lodash._isnative": "2.4.1",
+            "lodash._shimkeys": "2.4.1",
+            "lodash.isobject": "2.4.1"
+          }
+        }
+      }
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "dev": true,
+      "requires": {
+        "align-text": "0.1.4",
+        "lazy-cache": "1.0.4"
+      }
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "dev": true,
+      "requires": {
+        "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": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "change-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.0.0.tgz",
+      "integrity": "sha1-bJyONfh5CHCoK2sHRb6MPL75sIE=",
+      "dev": true,
+      "requires": {
+        "camel-case": "3.0.0",
+        "constant-case": "2.0.0",
+        "dot-case": "2.1.1",
+        "header-case": "1.0.1",
+        "is-lower-case": "1.1.3",
+        "is-upper-case": "1.1.2",
+        "lower-case": "1.1.4",
+        "lower-case-first": "1.0.2",
+        "no-case": "2.3.1",
+        "param-case": "2.1.1",
+        "pascal-case": "2.0.1",
+        "path-case": "2.1.1",
+        "sentence-case": "2.1.1",
+        "snake-case": "2.1.0",
+        "swap-case": "1.1.2",
+        "title-case": "2.1.1",
+        "upper-case": "1.1.3",
+        "upper-case-first": "1.1.2"
+      }
+    },
+    "chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+      "dev": true,
+      "requires": {
+        "anymatch": "1.3.0",
+        "async-each": "1.0.1",
+        "fsevents": "1.1.2",
+        "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"
+      }
+    },
+    "chroma-js": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-1.3.4.tgz",
+      "integrity": "sha1-k6fBnyh5YChcw/3rsgW46hoPBPk=",
+      "dev": true
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "clean-css": {
+      "version": "3.4.27",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.27.tgz",
+      "integrity": "sha1-re91sxwWD/pdcvTeZ5ZuJmDBolU=",
+      "dev": true,
+      "requires": {
+        "commander": "2.8.1",
+        "source-map": "0.4.4"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.8.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+          "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
+          "dev": true,
+          "requires": {
+            "graceful-readlink": "1.0.1"
+          }
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "cli-boxes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
+      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
+      "dev": true
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz",
+      "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=",
+      "dev": true
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wrap-ansi": "2.1.0"
+      }
+    },
+    "clone": {
+      "version": "0.1.19",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz",
+      "integrity": "sha1-YT+2hjmyaklKxTJT4Vsaa9iK2oU=",
+      "dev": true
+    },
+    "clone-stats": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
+      "dev": true
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "coffee-script": {
+      "version": "1.12.6",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz",
+      "integrity": "sha1-KFo/cRVokGUGTWv570Vy22ZpXL8=",
+      "dev": true
+    },
+    "color-convert": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
+      "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.2"
+      }
+    },
+    "color-name": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz",
+      "integrity": "sha1-XIq3K2S9IhXWF66VWeuxSEdc+Y0=",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
+    },
+    "combine-lists": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
+      "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+      "dev": true
+    },
+    "compare-func": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
+      "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
+      "dev": true,
+      "requires": {
+        "array-ify": "1.0.0",
+        "dot-prop": "3.0.0"
+      }
+    },
+    "component-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
+      "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
+      "dev": true
+    },
+    "component-inherit": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
+      "dev": true
+    },
+    "compressible": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz",
+      "integrity": "sha1-/tocf3YXkScyspv4zyYlKiC57s0=",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.27.0"
+      }
+    },
+    "compression": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz",
+      "integrity": "sha1-sDuNhub4rSloPLqN+R3cb/x3s5U=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.2.13",
+        "bytes": "2.1.0",
+        "compressible": "2.0.10",
+        "debug": "2.2.0",
+        "on-headers": "1.0.1",
+        "vary": "1.0.1"
+      },
+      "dependencies": {
+        "accepts": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz",
+          "integrity": "sha1-5fHzkoxtlf2WVYw27D2dDeSm7Oo=",
+          "dev": true,
+          "requires": {
+            "mime-types": "2.1.15",
+            "negotiator": "0.5.3"
+          }
+        },
+        "bytes": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz",
+          "integrity": "sha1-rJPEEOL/ycx89LRks4KJBn9eR7Q=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        },
+        "negotiator": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz",
+          "integrity": "sha1-Jp1cR2gQ7JLtvntsLygxY4T5p+g=",
+          "dev": true
+        },
+        "vary": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz",
+          "integrity": "sha1-meSYFWaihhGN+yuBc1ffeZM3bRA=",
+          "dev": true
+        }
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "typedarray": "0.0.6"
+      }
+    },
+    "concat-with-sourcemaps": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz",
+      "integrity": "sha1-9Vs74q60dgGxCi1SWcz7cP0vHdY=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.6"
+      }
+    },
+    "configstore": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz",
+      "integrity": "sha1-Rd+QcHPibfoc9LLVL1tgVF6qEdE=",
+      "dev": true,
+      "requires": {
+        "dot-prop": "4.1.1",
+        "graceful-fs": "4.1.11",
+        "make-dir": "1.0.0",
+        "unique-string": "1.0.0",
+        "write-file-atomic": "2.1.0",
+        "xdg-basedir": "3.0.0"
+      },
+      "dependencies": {
+        "dot-prop": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz",
+          "integrity": "sha1-qEk/C3te7sglJbXHWH+n3nyoWcE=",
+          "dev": true,
+          "requires": {
+            "is-obj": "1.0.1"
+          }
+        }
+      }
+    },
+    "connect": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz",
+      "integrity": "sha1-s1dSWgtMH1BZnNmD4dnv7qlncZg=",
+      "dev": true,
+      "requires": {
+        "debug": "2.2.0",
+        "finalhandler": "0.5.0",
+        "parseurl": "1.3.1",
+        "utils-merge": "1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "finalhandler": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz",
+          "integrity": "sha1-6VCKvs6bbbqHGmlCodeRG5GRGsc=",
+          "dev": true,
+          "requires": {
+            "debug": "2.2.0",
+            "escape-html": "1.0.3",
+            "on-finished": "2.3.0",
+            "statuses": "1.3.1",
+            "unpipe": "1.0.0"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "connect-livereload": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.4.tgz",
+      "integrity": "sha1-gBV9E3HJ83zBQDmrGJWXDRGdw7w=",
+      "dev": true
+    },
+    "connect-timeout": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz",
+      "integrity": "sha1-3ppexh4zoStu2qt7XwYumMWZuI4=",
+      "dev": true,
+      "requires": {
+        "debug": "2.2.0",
+        "http-errors": "1.3.1",
+        "ms": "0.7.1",
+        "on-headers": "1.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "http-errors": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz",
+          "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "statuses": "1.3.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "requires": {
+        "date-now": "0.1.4"
+      }
+    },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+      "dev": true
+    },
+    "constant-case": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz",
+      "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=",
+      "dev": true,
+      "requires": {
+        "snake-case": "2.1.0",
+        "upper-case": "1.1.3"
+      }
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
+      "dev": true
+    },
+    "content-type": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz",
+      "integrity": "sha1-t9ETrueo3Se9IRM8TcJSnfFyHu0=",
+      "dev": true
+    },
+    "continuable-cache": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+      "dev": true
+    },
+    "conventional-changelog": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.0.tgz",
+      "integrity": "sha1-iuP7Wf63S77golgz7h+D2tSgeHQ=",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-angular": "1.3.3",
+        "conventional-changelog-atom": "0.1.0",
+        "conventional-changelog-codemirror": "0.1.0",
+        "conventional-changelog-core": "1.8.0",
+        "conventional-changelog-ember": "0.2.5",
+        "conventional-changelog-eslint": "0.1.0",
+        "conventional-changelog-express": "0.1.0",
+        "conventional-changelog-jquery": "0.1.0",
+        "conventional-changelog-jscs": "0.1.0",
+        "conventional-changelog-jshint": "0.1.0"
+      }
+    },
+    "conventional-changelog-angular": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.3.3.tgz",
+      "integrity": "sha1-586AeoXdR1DhtBf3ZgRUl1EeByY=",
+      "dev": true,
+      "requires": {
+        "compare-func": "1.3.2",
+        "github-url-from-git": "1.5.0",
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-atom": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.0.tgz",
+      "integrity": "sha1-Z6R8ZqQrL4kJ7xWHyZia4d5zC5I=",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-codemirror": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz",
+      "integrity": "sha1-dXelkdv5tTjnoVCn7mL2WihyszQ=",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-core": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.8.0.tgz",
+      "integrity": "sha1-l3hItBbK8V+wnyCxKmLUDvFFuVc=",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-writer": "1.4.1",
+        "conventional-commits-parser": "1.3.0",
+        "dateformat": "1.0.12",
+        "get-pkg-repo": "1.4.0",
+        "git-raw-commits": "1.2.0",
+        "git-remote-origin-url": "2.0.0",
+        "git-semver-tags": "1.2.0",
+        "lodash": "4.17.4",
+        "normalize-package-data": "2.4.0",
+        "q": "1.4.1",
+        "read-pkg": "1.1.0",
+        "read-pkg-up": "1.0.1",
+        "through2": "2.0.1"
+      }
+    },
+    "conventional-changelog-ember": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.5.tgz",
+      "integrity": "sha1-ziHVz4PNXr4F0j/fIy2IRPS1ak8=",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-eslint": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz",
+      "integrity": "sha1-pSQR6ZngUBzlALhWsKZD0DMJB+I=",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-express": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz",
+      "integrity": "sha1-VcbIQcgRliA2wDe9vZZKVK4xD84=",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-jquery": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz",
+      "integrity": "sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-jscs": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz",
+      "integrity": "sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-jshint": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz",
+      "integrity": "sha1-AMq46aMxdIer2UxNhGcTQpGNKgc=",
+      "dev": true,
+      "requires": {
+        "compare-func": "1.3.2",
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-writer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz",
+      "integrity": "sha1-P0y00APrtWmJ0w00WJO1KkNjnI4=",
+      "dev": true,
+      "requires": {
+        "compare-func": "1.3.2",
+        "conventional-commits-filter": "1.0.0",
+        "dateformat": "1.0.12",
+        "handlebars": "4.0.10",
+        "json-stringify-safe": "5.0.1",
+        "lodash": "4.17.4",
+        "meow": "3.7.0",
+        "semver": "5.3.0",
+        "split": "1.0.0",
+        "through2": "2.0.1"
+      }
+    },
+    "conventional-commits-filter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz",
+      "integrity": "sha1-b8KmWTcrw/IznPn//34bA0S5MDk=",
+      "dev": true,
+      "requires": {
+        "is-subset": "0.1.1",
+        "modify-values": "1.0.0"
+      }
+    },
+    "conventional-commits-parser": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz",
+      "integrity": "sha1-4ye1MZThp61dxjR57pCZpSsCSGU=",
+      "dev": true,
+      "requires": {
+        "is-text-path": "1.0.1",
+        "JSONStream": "1.3.1",
+        "lodash": "4.17.4",
+        "meow": "3.7.0",
+        "split2": "2.1.1",
+        "through2": "2.0.1",
+        "trim-off-newlines": "1.0.1"
+      }
+    },
+    "convert-source-map": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
+      "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
+      "dev": true
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+      "dev": true
+    },
+    "cookie-parser": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz",
+      "integrity": "sha1-nXVVcPtdF4kHcSJ6AjFNm+fPg1Y=",
+      "dev": true,
+      "requires": {
+        "cookie": "0.1.3",
+        "cookie-signature": "1.0.6"
+      },
+      "dependencies": {
+        "cookie": {
+          "version": "0.1.3",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz",
+          "integrity": "sha1-5zSlwUF/zkctWu+Cw4HKu2TRpDU=",
+          "dev": true
+        }
+      }
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "dev": true
+    },
+    "core-js": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
+      "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cpr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cpr/-/cpr-2.0.0.tgz",
+      "integrity": "sha1-wqRHyVFsN+u2R8qiYWvu+i7mcBE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.1"
+      }
+    },
+    "crc": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz",
+      "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=",
+      "dev": true
+    },
+    "create-ecdh": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
+      "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.7",
+        "elliptic": "6.4.0"
+      }
+    },
+    "create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+      "dev": true,
+      "requires": {
+        "capture-stack-trace": "1.0.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
+      "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.4",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.1",
+        "sha.js": "2.4.8"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
+      "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.4",
+        "create-hash": "1.1.3",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.1",
+        "safe-buffer": "5.1.1",
+        "sha.js": "2.4.8"
+      }
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "4.1.1",
+        "shebang-command": "1.2.0",
+        "which": "1.2.14"
+      }
+    },
+    "cryptiles": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "dev": true,
+      "requires": {
+        "boom": "2.10.1"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz",
+      "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "1.0.0",
+        "browserify-sign": "4.0.4",
+        "create-ecdh": "4.0.0",
+        "create-hash": "1.1.3",
+        "create-hmac": "1.1.6",
+        "diffie-hellman": "5.0.2",
+        "inherits": "2.0.3",
+        "pbkdf2": "3.0.12",
+        "public-encrypt": "4.0.0",
+        "randombytes": "2.0.5"
+      }
+    },
+    "crypto-random-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
+      "dev": true
+    },
+    "csrf": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz",
+      "integrity": "sha1-thEg3c7q/JHnbtUxO7XAsmZ7cQo=",
+      "dev": true,
+      "requires": {
+        "rndm": "1.2.0",
+        "tsscmp": "1.0.5",
+        "uid-safe": "2.1.4"
+      }
+    },
+    "csurf": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz",
+      "integrity": "sha1-I/KhO/HY/OHQyZZYg5RELLqGpWo=",
+      "dev": true,
+      "requires": {
+        "cookie": "0.1.3",
+        "cookie-signature": "1.0.6",
+        "csrf": "3.0.6",
+        "http-errors": "1.3.1"
+      },
+      "dependencies": {
+        "cookie": {
+          "version": "0.1.3",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz",
+          "integrity": "sha1-5zSlwUF/zkctWu+Cw4HKu2TRpDU=",
+          "dev": true
+        },
+        "http-errors": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz",
+          "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "statuses": "1.3.1"
+          }
+        }
+      }
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "1.0.2"
+      }
+    },
+    "custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
+      "dev": true
+    },
+    "cycle": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+      "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=",
+      "dev": true
+    },
+    "dargs": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz",
+      "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
+    "dateformat": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+      "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "4.0.1",
+        "meow": "3.7.0"
+      }
+    },
+    "debug": {
+      "version": "2.6.8",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "deep-extend": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "defaults": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+      "dev": true,
+      "requires": {
+        "clone": "1.0.2"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+          "dev": true
+        }
+      }
+    },
+    "deferred-leveldown": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz",
+      "integrity": "sha1-LO8fER4cV4cNi7uK8mUOWHzS9bQ=",
+      "dev": true,
+      "requires": {
+        "abstract-leveldown": "0.12.4"
+      }
+    },
+    "del": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+      "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.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "rimraf": "2.6.1"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "dev": true
+    },
+    "depd": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
+      "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM=",
+      "dev": true
+    },
+    "dependency-graph": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.4.1.tgz",
+      "integrity": "sha1-MC5YIY2FxRqXY4cw2/m32FKhlpM=",
+      "dev": true
+    },
+    "deprecated": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
+      "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
+      "dev": true
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.0"
+      }
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
+    },
+    "detect-file": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz",
+      "integrity": "sha1-STXe39lIhkjgBrASlWbpOGcR6mM=",
+      "dev": true,
+      "requires": {
+        "fs-exists-sync": "0.1.0"
+      }
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "dgeni": {
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/dgeni/-/dgeni-0.4.9.tgz",
+      "integrity": "sha1-nkJ3WxOGyl64JHU6ws0WnY9hztE=",
+      "dev": true,
+      "requires": {
+        "canonical-path": "0.0.2",
+        "dependency-graph": "0.4.1",
+        "di": "0.0.1",
+        "lodash": "3.10.1",
+        "objectdiff": "1.1.0",
+        "optimist": "0.6.1",
+        "q": "1.4.1",
+        "validate.js": "0.9.0",
+        "winston": "2.3.1"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "dev": true
+        }
+      }
+    },
+    "dgeni-packages": {
+      "version": "0.16.10",
+      "resolved": "https://registry.npmjs.org/dgeni-packages/-/dgeni-packages-0.16.10.tgz",
+      "integrity": "sha1-mRltAUpum3+AmqDrP9u8bUUxH28=",
+      "dev": true,
+      "requires": {
+        "canonical-path": "0.0.2",
+        "catharsis": "0.8.9",
+        "change-case": "3.0.0",
+        "dgeni": "0.4.9",
+        "espree": "2.2.5",
+        "estraverse": "4.2.0",
+        "glob": "7.0.6",
+        "htmlparser2": "3.9.2",
+        "lodash": "4.17.4",
+        "marked": "0.3.6",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "mkdirp-promise": "5.0.1",
+        "node-html-encoder": "0.0.2",
+        "nunjucks": "2.5.2",
+        "semver": "5.3.0",
+        "shelljs": "0.7.8",
+        "spdx-license-list": "2.1.0",
+        "stringmap": "0.2.2",
+        "typescript": "1.8.10"
+      },
+      "dependencies": {
+        "typescript": {
+          "version": "1.8.10",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz",
+          "integrity": "sha1-tHXW4N/wv1DyluXKbvn7tccyDx4=",
+          "dev": true
+        }
+      }
+    },
+    "di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+      "dev": true
+    },
+    "diff": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.0.tgz",
+      "integrity": "sha512-w0XZubFWn0Adlsapj9EAWX0FqWdO4tz8kc3RiYdWLh4k/V8PTb6i0SMgXt0vRM3zyKnT8tKO7mUlieRQHIjMNg==",
+      "dev": true
+    },
+    "diffie-hellman": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
+      "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.7",
+        "miller-rabin": "4.0.0",
+        "randombytes": "2.0.5"
+      }
+    },
+    "docopt": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/docopt/-/docopt-0.6.2.tgz",
+      "integrity": "sha1-so6eIiDaXsSffqW7JKR3h0Be6xE=",
+      "dev": true
+    },
+    "doctrine": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz",
+      "integrity": "sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=",
+      "dev": true,
+      "requires": {
+        "esutils": "1.1.6",
+        "isarray": "0.0.1"
+      },
+      "dependencies": {
+        "esutils": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz",
+          "integrity": "sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=",
+          "dev": true
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        }
+      }
+    },
+    "dom-serialize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
+      "dev": true,
+      "requires": {
+        "custom-event": "1.0.1",
+        "ent": "2.2.0",
+        "extend": "3.0.1",
+        "void-elements": "2.0.1"
+      }
+    },
+    "dom-serializer": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.1.3",
+        "entities": "1.1.1"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
+          "dev": true
+        }
+      }
+    },
+    "domain-browser": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
+      "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=",
+      "dev": true
+    },
+    "domelementtype": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
+      "dev": true
+    },
+    "domhandler": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
+      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.3.0"
+      }
+    },
+    "domutils": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
+      "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0.1.0",
+        "domelementtype": "1.3.0"
+      }
+    },
+    "dot-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz",
+      "integrity": "sha1-NNzzf1Co6TwrO8qLt/uRVcfaO+4=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.1"
+      }
+    },
+    "dot-prop": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
+      "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
+      "dev": true,
+      "requires": {
+        "is-obj": "1.0.1"
+      }
+    },
+    "dotenv": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz",
+      "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=",
+      "dev": true
+    },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "dev": true
+    },
+    "duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "1.1.14"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true
+    },
+    "duplexify": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz",
+      "integrity": "sha1-GqdzAC4VeEV+nZ1KULDMquvL1gQ=",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "stream-shift": "1.0.0"
+      },
+      "dependencies": {
+        "end-of-stream": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
+          "integrity": "sha1-1FlucCc0qT5A6a+GQxnqvZn/Lw4=",
+          "dev": true,
+          "requires": {
+            "once": "1.3.3"
+          }
+        },
+        "once": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+          "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        }
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "electron-to-chromium": {
+      "version": "1.3.15",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz",
+      "integrity": "sha1-CDl5NIkcvPrrvRi4KpW1pIETg2k=",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
+      "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.7",
+        "brorand": "1.1.0",
+        "hash.js": "1.1.3",
+        "hmac-drbg": "1.0.1",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.0",
+        "minimalistic-crypto-utils": "1.0.1"
+      }
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
+      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+      "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=",
+      "dev": true,
+      "requires": {
+        "once": "1.3.3"
+      },
+      "dependencies": {
+        "once": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+          "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        }
+      }
+    },
+    "ends-with": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/ends-with/-/ends-with-0.2.0.tgz",
+      "integrity": "sha1-L52pjVelDP2kVxzkM5AAUA9Oa4o=",
+      "dev": true
+    },
+    "engine.io": {
+      "version": "1.6.10",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz",
+      "integrity": "sha1-+H2E4b0h0aLsf43u8MYgVKzfsno=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.1.4",
+        "base64id": "0.1.0",
+        "debug": "2.2.0",
+        "engine.io-parser": "1.2.4",
+        "ws": "1.0.1"
+      },
+      "dependencies": {
+        "accepts": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz",
+          "integrity": "sha1-1xyW99QdD+2iw4zRToonwEFY30o=",
+          "dev": true,
+          "requires": {
+            "mime-types": "2.0.14",
+            "negotiator": "0.4.9"
+          }
+        },
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "mime-db": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
+          "integrity": "sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc=",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.0.14",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
+          "integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY=",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.12.0"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        },
+        "negotiator": {
+          "version": "0.4.9",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz",
+          "integrity": "sha1-kuRrbbU8fkIe1koryU8IvnYw3z8=",
+          "dev": true
+        },
+        "ws": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz",
+          "integrity": "sha1-fQsqLljN3YGQOcKcneZQReGzEOk=",
+          "dev": true,
+          "requires": {
+            "options": "0.0.6",
+            "ultron": "1.0.2"
+          }
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "1.6.9",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz",
+      "integrity": "sha1-HWrUgEilCDyVCWlDsp0279shJAE=",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.1.2",
+        "component-inherit": "0.0.3",
+        "debug": "2.2.0",
+        "engine.io-parser": "1.2.4",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parsejson": "0.0.1",
+        "parseqs": "0.0.2",
+        "parseuri": "0.0.4",
+        "ws": "1.0.1",
+        "xmlhttprequest-ssl": "1.5.1",
+        "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        },
+        "ws": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz",
+          "integrity": "sha1-fQsqLljN3YGQOcKcneZQReGzEOk=",
+          "dev": true,
+          "requires": {
+            "options": "0.0.6",
+            "ultron": "1.0.2"
+          }
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz",
+      "integrity": "sha1-4Il7C/FOeS1M0qWVBVORnFaUjEI=",
+      "dev": true,
+      "requires": {
+        "after": "0.8.1",
+        "arraybuffer.slice": "0.0.6",
+        "base64-arraybuffer": "0.1.2",
+        "blob": "0.0.4",
+        "has-binary": "0.1.6",
+        "utf8": "2.1.0"
+      },
+      "dependencies": {
+        "has-binary": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz",
+          "integrity": "sha1-JTJvOc+k9hath4eJTjryz7x7bhA=",
+          "dev": true,
+          "requires": {
+            "isarray": "0.0.1"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        }
+      }
+    },
+    "enhanced-resolve": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz",
+      "integrity": "sha512-2qbxE7ek3YxPJ1ML6V+satHkzHpJQKWkRHmRx6mfAoW59yP8YH8BFplbegSP+u2hBd6B6KCOpvJQ3dZAP+hkpg==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "memory-fs": "0.4.1",
+        "object-assign": "4.1.1",
+        "tapable": "0.2.6"
+      }
+    },
+    "ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+      "dev": true
+    },
+    "entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
+      "dev": true
+    },
+    "errno": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
+      "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
+      "dev": true,
+      "requires": {
+        "prr": "0.0.0"
+      }
+    },
+    "error": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz",
+      "integrity": "sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=",
+      "dev": true,
+      "requires": {
+        "string-template": "0.2.1",
+        "xtend": "4.0.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
+      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "0.2.1"
+      }
+    },
+    "errorhandler": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz",
+      "integrity": "sha1-t7cO2PNZ6duICS8tIMD4MUIK2D8=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.3",
+        "escape-html": "1.0.3"
+      }
+    },
+    "es6-denodeify": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-denodeify/-/es6-denodeify-0.1.5.tgz",
+      "integrity": "sha1-MdTV/pxVA+ElRgQ5MQ4WoqPznB8=",
+      "dev": true
+    },
+    "es6-promise": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
+      "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
+      "dev": true
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "escodegen": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
+      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+      "dev": true,
+      "requires": {
+        "esprima": "2.7.3",
+        "estraverse": "1.9.3",
+        "esutils": "2.0.2",
+        "optionator": "0.8.2",
+        "source-map": "0.2.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        },
+        "estraverse": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
+          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "espree": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz",
+      "integrity": "sha1-32kbkxCIlAKuspzAZnCMVmkLhUs=",
+      "dev": true
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
+    "estree-walker": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.3.1.tgz",
+      "integrity": "sha1-5rGlHPcpJSTnI3wxLl/mZgwc4ao=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
+    },
+    "etag": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz",
+      "integrity": "sha1-b2Ma7zNtbEY2K1F2QETOIWvjwFE=",
+      "dev": true
+    },
+    "event-stream": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+      "dev": true,
+      "requires": {
+        "duplexer": "0.1.1",
+        "from": "0.1.7",
+        "map-stream": "0.1.0",
+        "pause-stream": "0.0.11",
+        "split": "0.3.3",
+        "stream-combiner": "0.0.4",
+        "through": "2.3.8"
+      },
+      "dependencies": {
+        "split": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+          "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+          "dev": true,
+          "requires": {
+            "through": "2.3.8"
+          }
+        }
+      }
+    },
+    "eventemitter3": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
+      "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
+      "dev": true
+    },
+    "events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+      "dev": true
+    },
+    "evp_bytestokey": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz",
+      "integrity": "sha1-SXtmrZ/vZc18CKYYCCS6FHa2blM=",
+      "dev": true,
+      "requires": {
+        "create-hash": "1.1.3"
+      }
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "dev": true,
+      "requires": {
+        "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"
+      }
+    },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true
+    },
+    "expand-braces": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
+      "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
+      "dev": true,
+      "requires": {
+        "array-slice": "0.2.3",
+        "array-unique": "0.2.1",
+        "braces": "0.1.5"
+      },
+      "dependencies": {
+        "array-slice": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+          "dev": true
+        },
+        "braces": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
+          "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
+          "dev": true,
+          "requires": {
+            "expand-range": "0.1.1"
+          }
+        },
+        "expand-range": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
+          "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
+          "dev": true,
+          "requires": {
+            "is-number": "0.1.1",
+            "repeat-string": "0.2.2"
+          }
+        },
+        "is-number": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
+          "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
+          "dev": true
+        },
+        "repeat-string": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
+          "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
+          "dev": true
+        }
+      }
+    },
+    "expand-brackets": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+      "dev": true,
+      "requires": {
+        "is-posix-bracket": "0.1.1"
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "dev": true,
+      "requires": {
+        "fill-range": "2.2.3"
+      }
+    },
+    "expand-tilde": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
+      "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2"
+      }
+    },
+    "express": {
+      "version": "4.15.3",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.15.3.tgz",
+      "integrity": "sha1-urZdDwOqgMNYQIly/HAPkWlEtmI=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.3",
+        "array-flatten": "1.1.1",
+        "content-disposition": "0.5.2",
+        "content-type": "1.0.2",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.7",
+        "depd": "1.1.0",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "etag": "1.8.0",
+        "finalhandler": "1.0.3",
+        "fresh": "0.5.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "1.1.2",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.1",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "1.1.4",
+        "qs": "6.4.0",
+        "range-parser": "1.2.0",
+        "send": "0.15.3",
+        "serve-static": "1.12.3",
+        "setprototypeof": "1.0.3",
+        "statuses": "1.3.1",
+        "type-is": "1.6.15",
+        "utils-merge": "1.0.0",
+        "vary": "1.1.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
+          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "serve-static": {
+          "version": "1.12.3",
+          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz",
+          "integrity": "sha1-n0uhni8wMMVH+K+ZEHg47DjVseI=",
+          "dev": true,
+          "requires": {
+            "encodeurl": "1.0.1",
+            "escape-html": "1.0.3",
+            "parseurl": "1.3.1",
+            "send": "0.15.3"
+          }
+        }
+      }
+    },
+    "express-session": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz",
+      "integrity": "sha1-XMmPP1/4Ttg1+Ry/CqvQxxB0AK8=",
+      "dev": true,
+      "requires": {
+        "cookie": "0.1.3",
+        "cookie-signature": "1.0.6",
+        "crc": "3.3.0",
+        "debug": "2.2.0",
+        "depd": "1.0.1",
+        "on-headers": "1.0.1",
+        "parseurl": "1.3.1",
+        "uid-safe": "2.0.0",
+        "utils-merge": "1.0.0"
+      },
+      "dependencies": {
+        "cookie": {
+          "version": "0.1.3",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz",
+          "integrity": "sha1-5zSlwUF/zkctWu+Cw4HKu2TRpDU=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "depd": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz",
+          "integrity": "sha1-gK7GTJ1tl+ZcwqnKqTwKpqv3Oqo=",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        },
+        "uid-safe": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz",
+          "integrity": "sha1-p/PGymSh9qXQTsDvPkw9U2cxcTc=",
+          "dev": true,
+          "requires": {
+            "base64-url": "1.2.1"
+          }
+        }
+      }
+    },
+    "extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+      "dev": true
+    },
+    "extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "requires": {
+        "is-extendable": "0.1.1"
+      }
+    },
+    "external-editor": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz",
+      "integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "0.4.18",
+        "jschardet": "1.4.2",
+        "tmp": "0.0.31"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.18",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz",
+          "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==",
+          "dev": true
+        },
+        "tmp": {
+          "version": "0.0.31",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
+          "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
+          "dev": true,
+          "requires": {
+            "os-tmpdir": "1.0.2"
+          }
+        }
+      }
+    },
+    "extglob": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "extsprintf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
+      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
+      "dev": true
+    },
+    "eyes": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+      "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=",
+      "dev": true
+    },
+    "fancy-log": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz",
+      "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "time-stamp": "1.1.0"
+      }
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": "0.6.5"
+      }
+    },
+    "fd-slicer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "dev": true,
+      "requires": {
+        "pend": "1.2.0"
+      }
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5"
+      }
+    },
+    "file-loader": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.9.0.tgz",
+      "integrity": "sha1-HS2t3UJM5tGwfP4/eXMb7TYXq0I=",
+      "dev": true,
+      "requires": {
+        "loader-utils": "0.2.17"
+      }
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+      "dev": true
+    },
+    "fileset": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.1.8.tgz",
+      "integrity": "sha1-UGuRqTluqn4y+0KoQHfHoMc2t0E=",
+      "dev": true,
+      "requires": {
+        "glob": "3.2.11",
+        "minimatch": "0.4.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "3.2.11",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+          "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "minimatch": "0.3.0"
+          },
+          "dependencies": {
+            "minimatch": {
+              "version": "0.3.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+              "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
+              "dev": true,
+              "requires": {
+                "lru-cache": "2.7.3",
+                "sigmund": "1.0.1"
+              }
+            }
+          }
+        },
+        "lru-cache": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+          "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz",
+          "integrity": "sha1-vSx9Bg0sjI/Xzefx8u0tWycP2xs=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "2.7.3",
+            "sigmund": "1.0.1"
+          }
+        }
+      }
+    },
+    "fill-range": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
+      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+      "dev": true,
+      "requires": {
+        "is-number": "2.1.0",
+        "isobject": "2.1.0",
+        "randomatic": "1.1.7",
+        "repeat-element": "1.1.2",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "finalhandler": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz",
+      "integrity": "sha1-70fneVDpmXgOhgIqVg4yF+DQzIk=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.7",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.1",
+        "statuses": "1.3.1",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
+          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "find-index": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
+      "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
+      "dev": true
+    },
+    "find-parent-dir": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
+      "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
+      "dev": true
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "requires": {
+        "path-exists": "2.1.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "findit2": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz",
+      "integrity": "sha1-WKRmaX34piBc39vzlVNri9d3pfY=",
+      "dev": true
+    },
+    "findup-sync": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
+      "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
+      "dev": true,
+      "requires": {
+        "glob": "5.0.15"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "fined": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz",
+      "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "2.0.2",
+        "is-plain-object": "2.0.4",
+        "object.defaults": "1.1.0",
+        "object.pick": "1.2.0",
+        "parse-filepath": "1.0.1"
+      },
+      "dependencies": {
+        "expand-tilde": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+          "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+          "dev": true,
+          "requires": {
+            "homedir-polyfill": "1.0.1"
+          }
+        }
+      }
+    },
+    "first-chunk-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
+      "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=",
+      "dev": true
+    },
+    "flagged-respawn": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz",
+      "integrity": "sha1-/xke3c1wiKZ1smEP/8l2vpuAdLU=",
+      "dev": true
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "dev": true,
+      "requires": {
+        "for-in": "1.0.2"
+      }
+    },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "fork-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
+      "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz",
+      "integrity": "sha1-bwrrrcxdoWwT4ezBETfYX5uIOyU=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.15"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz",
+      "integrity": "sha1-Ge+YdMSuHCl7zweP3mOgm2aoQ2M=",
+      "dev": true
+    },
+    "fresh": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz",
+      "integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44=",
+      "dev": true
+    },
+    "from": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+      "dev": true
+    },
+    "fs-access": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+      "dev": true,
+      "requires": {
+        "null-check": "1.0.0"
+      }
+    },
+    "fs-exists-sync": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
+      "integrity": "sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=",
+      "dev": true
+    },
+    "fs-extra": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz",
+      "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "2.4.0"
+      }
+    },
+    "fs-readdir-recursive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz",
+      "integrity": "sha1-jNF0XItPiinIyuw5JHaSG6GV9WA=",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
+      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.6.2",
+        "node-pre-gyp": "0.6.36"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "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"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "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"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "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": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.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.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.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "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",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.1"
+      }
+    },
+    "fwd-stream": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/fwd-stream/-/fwd-stream-1.0.4.tgz",
+      "integrity": "sha1-7Sgcq+1G/uz5Ie4y3ExQs3KsfPo=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "1.0.34"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dev": true,
+      "requires": {
+        "aproba": "1.1.2",
+        "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": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
+      "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
+      "dev": true,
+      "requires": {
+        "globule": "1.2.0"
+      }
+    },
+    "generate-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
+      "dev": true
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+      "dev": true,
+      "requires": {
+        "is-property": "1.0.2"
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
+      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
+      "dev": true
+    },
+    "get-pkg-repo": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz",
+      "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "2.5.0",
+        "meow": "3.7.0",
+        "normalize-package-data": "2.4.0",
+        "parse-github-repo-url": "1.4.0",
+        "through2": "2.0.1"
+      }
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "git-raw-commits": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.2.0.tgz",
+      "integrity": "sha1-DzqL/ZmuDy2LkiTViJKXXppS0Dw=",
+      "dev": true,
+      "requires": {
+        "dargs": "4.1.0",
+        "lodash.template": "4.4.0",
+        "meow": "3.7.0",
+        "split2": "2.1.1",
+        "through2": "2.0.1"
+      }
+    },
+    "git-remote-origin-url": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
+      "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
+      "dev": true,
+      "requires": {
+        "gitconfiglocal": "1.0.0",
+        "pify": "2.3.0"
+      }
+    },
+    "git-semver-tags": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.0.tgz",
+      "integrity": "sha1-sx/QLIq1eL1sm1ysyl4cZMEXesE=",
+      "dev": true,
+      "requires": {
+        "meow": "3.7.0",
+        "semver": "5.3.0"
+      }
+    },
+    "git-validate": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/git-validate/-/git-validate-2.2.2.tgz",
+      "integrity": "sha1-nMj/ABF3lXoRcmq1CNQVu4Cxi88=",
+      "dev": true
+    },
+    "gitconfiglocal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
+      "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
+      "dev": true,
+      "requires": {
+        "ini": "1.3.4"
+      }
+    },
+    "github": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/github/-/github-0.2.4.tgz",
+      "integrity": "sha1-JPp/DhP6EblGr5ETTFGYKpHOU4s=",
+      "dev": true,
+      "requires": {
+        "mime": "1.3.4"
+      }
+    },
+    "github-url-from-git": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz",
+      "integrity": "sha1-+YX+3MCpqledyI16/waNVcxiUaA=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+      "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "requires": {
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "dev": true,
+      "requires": {
+        "is-glob": "2.0.1"
+      }
+    },
+    "glob-stream": {
+      "version": "3.1.18",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+      "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=",
+      "dev": true,
+      "requires": {
+        "glob": "4.5.3",
+        "glob2base": "0.0.12",
+        "minimatch": "2.0.10",
+        "ordered-read-streams": "0.1.0",
+        "through2": "0.6.5",
+        "unique-stream": "1.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "4.5.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+          "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
+          "dev": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "2.0.10",
+            "once": "1.4.0"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.8"
+          }
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "through2": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34",
+            "xtend": "4.0.1"
+          }
+        }
+      }
+    },
+    "glob-watcher": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+      "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=",
+      "dev": true,
+      "requires": {
+        "gaze": "0.5.2"
+      },
+      "dependencies": {
+        "gaze": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+          "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=",
+          "dev": true,
+          "requires": {
+            "globule": "0.1.0"
+          }
+        },
+        "glob": {
+          "version": "3.1.21",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+          "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "1.2.3",
+            "inherits": "1.0.2",
+            "minimatch": "0.2.14"
+          }
+        },
+        "globule": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+          "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=",
+          "dev": true,
+          "requires": {
+            "glob": "3.1.21",
+            "lodash": "1.0.2",
+            "minimatch": "0.2.14"
+          }
+        },
+        "graceful-fs": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+          "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=",
+          "dev": true
+        },
+        "inherits": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
+          "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
+          "dev": true
+        },
+        "lodash": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
+          "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+          "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "0.2.14",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "2.7.3",
+            "sigmund": "1.0.1"
+          }
+        }
+      }
+    },
+    "glob2base": {
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+      "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=",
+      "dev": true,
+      "requires": {
+        "find-index": "0.1.1"
+      }
+    },
+    "global-modules": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
+      "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=",
+      "dev": true,
+      "requires": {
+        "global-prefix": "0.1.5",
+        "is-windows": "0.2.0"
+      }
+    },
+    "global-prefix": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
+      "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "1.0.1",
+        "ini": "1.3.4",
+        "is-windows": "0.2.0",
+        "which": "1.2.14"
+      }
+    },
+    "globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "dev": true
+    },
+    "globby": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "dev": true,
+      "requires": {
+        "array-union": "1.0.2",
+        "arrify": "1.0.1",
+        "glob": "7.0.6",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "globule": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
+      "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "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"
+          }
+        }
+      }
+    },
+    "glogg": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
+      "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=",
+      "dev": true,
+      "requires": {
+        "sparkles": "1.0.0"
+      }
+    },
+    "got": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+      "dev": true,
+      "requires": {
+        "create-error-class": "3.0.2",
+        "duplexer3": "0.1.4",
+        "get-stream": "3.0.0",
+        "is-redirect": "1.0.0",
+        "is-retry-allowed": "1.1.0",
+        "is-stream": "1.1.0",
+        "lowercase-keys": "1.0.0",
+        "safe-buffer": "5.1.1",
+        "timed-out": "4.0.1",
+        "unzip-response": "2.0.1",
+        "url-parse-lax": "1.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz",
+      "integrity": "sha1-3i1mE20ALhErpw8/EMMc98NQsto=",
+      "dev": true
+    },
+    "gulp": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
+      "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
+      "dev": true,
+      "requires": {
+        "archy": "1.0.0",
+        "chalk": "1.1.3",
+        "deprecated": "0.0.1",
+        "gulp-util": "3.0.7",
+        "interpret": "1.0.3",
+        "liftoff": "2.3.0",
+        "minimist": "1.2.0",
+        "orchestrator": "0.3.8",
+        "pretty-hrtime": "1.0.3",
+        "semver": "4.3.6",
+        "tildify": "1.2.0",
+        "v8flags": "2.1.1",
+        "vinyl-fs": "0.3.14"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
+          "dev": true
+        }
+      }
+    },
+    "gulp-autoprefixer": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-3.1.1.tgz",
+      "integrity": "sha1-dSMAUc0NFxND14O36bXREg7u+bA=",
+      "dev": true,
+      "requires": {
+        "autoprefixer": "6.7.7",
+        "gulp-util": "3.0.7",
+        "postcss": "5.2.17",
+        "through2": "2.0.1",
+        "vinyl-sourcemaps-apply": "0.2.1"
+      },
+      "dependencies": {
+        "autoprefixer": {
+          "version": "6.7.7",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
+          "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
+          "dev": true,
+          "requires": {
+            "browserslist": "1.7.7",
+            "caniuse-db": "1.0.30000701",
+            "normalize-range": "0.1.2",
+            "num2fraction": "1.2.2",
+            "postcss": "5.2.17",
+            "postcss-value-parser": "3.3.0"
+          }
+        },
+        "browserslist": {
+          "version": "1.7.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
+          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
+          "dev": true,
+          "requires": {
+            "caniuse-db": "1.0.30000701",
+            "electron-to-chromium": "1.3.15"
+          }
+        }
+      }
+    },
+    "gulp-babel": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/gulp-babel/-/gulp-babel-6.1.2.tgz",
+      "integrity": "sha1-fAF25Lo/JExgWIoMSzIKRdGt784=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.25.0",
+        "gulp-util": "3.0.7",
+        "object-assign": "4.1.1",
+        "replace-ext": "0.0.1",
+        "through2": "2.0.1",
+        "vinyl-sourcemaps-apply": "0.2.1"
+      }
+    },
+    "gulp-cached": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-cached/-/gulp-cached-1.1.0.tgz",
+      "integrity": "sha1-1VmdvZIGIgGp0qutOmSl68JzknA=",
+      "dev": true,
+      "requires": {
+        "lodash.defaults": "2.4.1",
+        "through2": "0.5.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "through2": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+          "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34",
+            "xtend": "3.0.0"
+          }
+        },
+        "xtend": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
+          "dev": true
+        }
+      }
+    },
+    "gulp-clean-css": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-2.0.12.tgz",
+      "integrity": "sha1-xDUiFUvMxmtKE23JKNd6oIGaGmc=",
+      "dev": true,
+      "requires": {
+        "clean-css": "3.4.27",
+        "gulp-util": "3.0.7",
+        "object-assign": "4.1.1",
+        "readable-stream": "2.3.3",
+        "vinyl-bufferstream": "1.0.1",
+        "vinyl-sourcemaps-apply": "0.2.1"
+      }
+    },
+    "gulp-concat": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.0.tgz",
+      "integrity": "sha1-WFz7EVQR80h3MTEUBWa2qBxpy5E=",
+      "dev": true,
+      "requires": {
+        "concat-with-sourcemaps": "1.0.4",
+        "gulp-util": "3.0.7",
+        "through2": "0.6.5"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "through2": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34",
+            "xtend": "4.0.1"
+          }
+        }
+      }
+    },
+    "gulp-connect": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-connect/-/gulp-connect-5.0.0.tgz",
+      "integrity": "sha1-8v3zBq6RFGg2jCKF8teC8T7dr04=",
+      "dev": true,
+      "requires": {
+        "connect": "2.30.2",
+        "connect-livereload": "0.5.4",
+        "event-stream": "3.3.4",
+        "gulp-util": "3.0.7",
+        "tiny-lr": "0.2.1"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz",
+          "integrity": "sha1-rJPEEOL/ycx89LRks4KJBn9eR7Q=",
+          "dev": true
+        },
+        "connect": {
+          "version": "2.30.2",
+          "resolved": "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz",
+          "integrity": "sha1-jam8vooFTT0xjXTf7JA7XDmhtgk=",
+          "dev": true,
+          "requires": {
+            "basic-auth-connect": "1.0.0",
+            "body-parser": "1.13.3",
+            "bytes": "2.1.0",
+            "compression": "1.5.2",
+            "connect-timeout": "1.6.2",
+            "content-type": "1.0.2",
+            "cookie": "0.1.3",
+            "cookie-parser": "1.3.5",
+            "cookie-signature": "1.0.6",
+            "csurf": "1.8.3",
+            "debug": "2.2.0",
+            "depd": "1.0.1",
+            "errorhandler": "1.4.3",
+            "express-session": "1.11.3",
+            "finalhandler": "0.4.0",
+            "fresh": "0.3.0",
+            "http-errors": "1.3.1",
+            "method-override": "2.3.9",
+            "morgan": "1.6.1",
+            "multiparty": "3.3.2",
+            "on-headers": "1.0.1",
+            "parseurl": "1.3.1",
+            "pause": "0.1.0",
+            "qs": "4.0.0",
+            "response-time": "2.3.2",
+            "serve-favicon": "2.3.2",
+            "serve-index": "1.7.3",
+            "serve-static": "1.10.3",
+            "type-is": "1.6.15",
+            "utils-merge": "1.0.0",
+            "vhost": "3.0.2"
+          }
+        },
+        "cookie": {
+          "version": "0.1.3",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz",
+          "integrity": "sha1-5zSlwUF/zkctWu+Cw4HKu2TRpDU=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "depd": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz",
+          "integrity": "sha1-gK7GTJ1tl+ZcwqnKqTwKpqv3Oqo=",
+          "dev": true
+        },
+        "escape-html": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz",
+          "integrity": "sha1-130y+pjjjC9BroXpJ44ODmuhAiw=",
+          "dev": true
+        },
+        "etag": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz",
+          "integrity": "sha1-A9MLX2fdbmMtKUXTDWZScxo01dg=",
+          "dev": true
+        },
+        "finalhandler": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz",
+          "integrity": "sha1-llpS2ejQXSuFdUhUH7ibU6JJfZs=",
+          "dev": true,
+          "requires": {
+            "debug": "2.2.0",
+            "escape-html": "1.0.2",
+            "on-finished": "2.3.0",
+            "unpipe": "1.0.0"
+          }
+        },
+        "fresh": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz",
+          "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=",
+          "dev": true
+        },
+        "http-errors": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz",
+          "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "statuses": "1.3.1"
+          }
+        },
+        "iconv-lite": {
+          "version": "0.4.13",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz",
+          "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        },
+        "qs": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz",
+          "integrity": "sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc=",
+          "dev": true
+        },
+        "range-parser": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz",
+          "integrity": "sha1-aHKCNTXGkuLCoBA4Jq/YLC4P8XU=",
+          "dev": true
+        },
+        "raw-body": {
+          "version": "2.1.7",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz",
+          "integrity": "sha1-rf6s4uT7MJgFgBTQjActzFl1h3Q=",
+          "dev": true,
+          "requires": {
+            "bytes": "2.4.0",
+            "iconv-lite": "0.4.13",
+            "unpipe": "1.0.0"
+          },
+          "dependencies": {
+            "bytes": {
+              "version": "2.4.0",
+              "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
+              "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=",
+              "dev": true
+            }
+          }
+        },
+        "send": {
+          "version": "0.13.2",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.13.2.tgz",
+          "integrity": "sha1-dl52B8gFVFK7pvCwUllTUJhgNt4=",
+          "dev": true,
+          "requires": {
+            "debug": "2.2.0",
+            "depd": "1.1.0",
+            "destroy": "1.0.4",
+            "escape-html": "1.0.3",
+            "etag": "1.7.0",
+            "fresh": "0.3.0",
+            "http-errors": "1.3.1",
+            "mime": "1.3.4",
+            "ms": "0.7.1",
+            "on-finished": "2.3.0",
+            "range-parser": "1.0.3",
+            "statuses": "1.2.1"
+          },
+          "dependencies": {
+            "depd": {
+              "version": "1.1.0",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
+              "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM=",
+              "dev": true
+            },
+            "escape-html": {
+              "version": "1.0.3",
+              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+              "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+              "dev": true
+            },
+            "statuses": {
+              "version": "1.2.1",
+              "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz",
+              "integrity": "sha1-3e1FzBglbVHtQK7BQkidXGECbSg=",
+              "dev": true
+            }
+          }
+        },
+        "serve-static": {
+          "version": "1.10.3",
+          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz",
+          "integrity": "sha1-zlpuzTEB/tXsCYJ9rCKpwpv7BTU=",
+          "dev": true,
+          "requires": {
+            "escape-html": "1.0.3",
+            "parseurl": "1.3.1",
+            "send": "0.13.2"
+          },
+          "dependencies": {
+            "escape-html": {
+              "version": "1.0.3",
+              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+              "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+              "dev": true
+            }
+          }
+        },
+        "tiny-lr": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-0.2.1.tgz",
+          "integrity": "sha1-s/26gC5dVqM8L28QeUsy5Hescp0=",
+          "dev": true,
+          "requires": {
+            "body-parser": "1.14.2",
+            "debug": "2.2.0",
+            "faye-websocket": "0.10.0",
+            "livereload-js": "2.2.2",
+            "parseurl": "1.3.1",
+            "qs": "5.1.0"
+          },
+          "dependencies": {
+            "body-parser": {
+              "version": "1.14.2",
+              "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.14.2.tgz",
+              "integrity": "sha1-EBXLH+LEQ4WCWVgdtTMy+NDPUPk=",
+              "dev": true,
+              "requires": {
+                "bytes": "2.2.0",
+                "content-type": "1.0.2",
+                "debug": "2.2.0",
+                "depd": "1.1.0",
+                "http-errors": "1.3.1",
+                "iconv-lite": "0.4.13",
+                "on-finished": "2.3.0",
+                "qs": "5.2.0",
+                "raw-body": "2.1.7",
+                "type-is": "1.6.15"
+              },
+              "dependencies": {
+                "qs": {
+                  "version": "5.2.0",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz",
+                  "integrity": "sha1-qfMRQq9GjLcrJbMBNrokVoNJFr4=",
+                  "dev": true
+                }
+              }
+            },
+            "bytes": {
+              "version": "2.2.0",
+              "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz",
+              "integrity": "sha1-/TVGSkA/b5EXwt42Cez/nK4ABYg=",
+              "dev": true
+            },
+            "depd": {
+              "version": "1.1.0",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
+              "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM=",
+              "dev": true
+            },
+            "qs": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz",
+              "integrity": "sha1-TZMuXH6kEcynajEtOaYGIA/VDNk=",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "gulp-conventional-changelog": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-conventional-changelog/-/gulp-conventional-changelog-1.1.0.tgz",
+      "integrity": "sha1-Cq4MAto+xFp7T+JYKV5JG0f/ogI=",
+      "dev": true,
+      "requires": {
+        "add-stream": "1.0.0",
+        "concat-stream": "1.6.0",
+        "conventional-changelog": "1.1.0",
+        "gulp-util": "3.0.7",
+        "object-assign": "4.1.1",
+        "through2": "2.0.1"
+      }
+    },
+    "gulp-git": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/gulp-git/-/gulp-git-1.11.3.tgz",
+      "integrity": "sha1-N1PAwr2n6Igsy3JF4sbXBmavmZo=",
+      "dev": true,
+      "requires": {
+        "any-shell-escape": "0.1.1",
+        "gulp-util": "3.0.7",
+        "require-dir": "0.1.0",
+        "through2": "0.6.5"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "through2": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34",
+            "xtend": "4.0.1"
+          }
+        }
+      }
+    },
+    "gulp-if": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.1.tgz",
+      "integrity": "sha1-VfPt+Czs389gNapdBoaXmqsNrCg=",
+      "dev": true,
+      "requires": {
+        "gulp-match": "1.0.3",
+        "ternary-stream": "2.0.1",
+        "through2": "2.0.1"
+      }
+    },
+    "gulp-match": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.0.3.tgz",
+      "integrity": "sha1-kcfA1/Kb7NZgbVfYCn+Hdqh6uo4=",
+      "dev": true,
+      "requires": {
+        "minimatch": "3.0.4"
+      }
+    },
+    "gulp-open": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-open/-/gulp-open-2.0.0.tgz",
+      "integrity": "sha1-oW9n6VzqiyBhtjo7jDibxVm44c4=",
+      "dev": true,
+      "requires": {
+        "colors": "1.1.2",
+        "gulp-util": "3.0.7",
+        "open": "0.0.5",
+        "through2": "2.0.1"
+      }
+    },
+    "gulp-remember": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/gulp-remember/-/gulp-remember-0.3.1.tgz",
+      "integrity": "sha1-V3a29kxaHFxNRVVAZyPsjisEB+c=",
+      "dev": true,
+      "requires": {
+        "gulp-util": "3.0.7",
+        "through2": "0.5.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "through2": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+          "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34",
+            "xtend": "3.0.0"
+          }
+        },
+        "xtend": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
+          "dev": true
+        }
+      }
+    },
+    "gulp-rename": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz",
+      "integrity": "sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc=",
+      "dev": true
+    },
+    "gulp-sass": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-2.3.2.tgz",
+      "integrity": "sha1-grerkP6QLNw0wE8YDZLyw0kC3VI=",
+      "dev": true,
+      "requires": {
+        "gulp-util": "3.0.7",
+        "lodash.clonedeep": "4.5.0",
+        "node-sass": "3.13.1",
+        "through2": "2.0.1",
+        "vinyl-sourcemaps-apply": "0.2.1"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "4.1.1",
+            "which": "1.2.14"
+          }
+        },
+        "node-sass": {
+          "version": "3.13.1",
+          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.13.1.tgz",
+          "integrity": "sha1-ckD7v/I5YwS0IjUn7TAgWJwAT8I=",
+          "dev": true,
+          "requires": {
+            "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.0.6",
+            "in-publish": "2.0.0",
+            "lodash.assign": "4.2.0",
+            "lodash.clonedeep": "4.5.0",
+            "meow": "3.7.0",
+            "mkdirp": "0.5.1",
+            "nan": "2.6.2",
+            "node-gyp": "3.6.2",
+            "npmlog": "4.1.2",
+            "request": "2.75.0",
+            "sass-graph": "2.2.4"
+          }
+        }
+      }
+    },
+    "gulp-scss-lint": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-scss-lint/-/gulp-scss-lint-0.4.0.tgz",
+      "integrity": "sha1-SjtojbXSsRP0T2N0aB5G853DQec=",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.0",
+        "dargs": "4.1.0",
+        "event-stream": "3.3.4",
+        "gulp-util": "3.0.7",
+        "pretty-data": "0.40.0",
+        "shell-escape": "0.2.0",
+        "slash": "1.0.0",
+        "sync-exec": "0.6.2",
+        "vinyl": "1.2.0",
+        "vinyl-fs": "2.4.4",
+        "xml2js": "0.4.17"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "3.1.0",
+            "path-dirname": "1.0.2"
+          }
+        },
+        "glob-stream": {
+          "version": "5.3.5",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
+          "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
+          "dev": true,
+          "requires": {
+            "extend": "3.0.1",
+            "glob": "5.0.15",
+            "glob-parent": "3.1.0",
+            "micromatch": "2.3.11",
+            "ordered-read-streams": "0.3.0",
+            "through2": "0.6.5",
+            "to-absolute-glob": "0.1.1",
+            "unique-stream": "2.2.1"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.34",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+              "dev": true,
+              "requires": {
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "0.0.1",
+                "string_decoder": "0.10.31"
+              }
+            },
+            "through2": {
+              "version": "0.6.5",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+              "dev": true,
+              "requires": {
+                "readable-stream": "1.0.34",
+                "xtend": "4.0.1"
+              }
+            }
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "ordered-read-streams": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
+          "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
+          "dev": true,
+          "requires": {
+            "is-stream": "1.1.0",
+            "readable-stream": "2.3.3"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "unique-stream": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
+          "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
+          "dev": true,
+          "requires": {
+            "json-stable-stringify": "1.0.1",
+            "through2-filter": "2.0.0"
+          }
+        },
+        "vinyl-fs": {
+          "version": "2.4.4",
+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
+          "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
+          "dev": true,
+          "requires": {
+            "duplexify": "3.5.0",
+            "glob-stream": "5.3.5",
+            "graceful-fs": "4.1.11",
+            "gulp-sourcemaps": "1.6.0",
+            "is-valid-glob": "0.3.0",
+            "lazystream": "1.0.0",
+            "lodash.isequal": "4.5.0",
+            "merge-stream": "1.0.1",
+            "mkdirp": "0.5.1",
+            "object-assign": "4.1.1",
+            "readable-stream": "2.3.3",
+            "strip-bom": "2.0.0",
+            "strip-bom-stream": "1.0.0",
+            "through2": "2.0.1",
+            "through2-filter": "2.0.0",
+            "vali-date": "1.0.0",
+            "vinyl": "1.2.0"
+          }
+        }
+      }
+    },
+    "gulp-shell": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/gulp-shell/-/gulp-shell-0.5.2.tgz",
+      "integrity": "sha1-pJWcoGUa0ce7/nCy0K27tOGuqY0=",
+      "dev": true,
+      "requires": {
+        "async": "1.5.2",
+        "gulp-util": "3.0.7",
+        "lodash": "4.17.4",
+        "through2": "2.0.1"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        }
+      }
+    },
+    "gulp-sourcemaps": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
+      "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
+      "dev": true,
+      "requires": {
+        "convert-source-map": "1.5.0",
+        "graceful-fs": "4.1.11",
+        "strip-bom": "2.0.0",
+        "through2": "2.0.1",
+        "vinyl": "1.2.0"
+      }
+    },
+    "gulp-strip-debug": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-strip-debug/-/gulp-strip-debug-1.1.0.tgz",
+      "integrity": "sha1-XVawCEUu32gj2t7LPmJU0G87XT0=",
+      "dev": true,
+      "requires": {
+        "gulp-util": "3.0.7",
+        "strip-debug": "1.1.1",
+        "through2": "2.0.1"
+      }
+    },
+    "gulp-tslint": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-8.1.1.tgz",
+      "integrity": "sha1-GpBuWfrK6s2pAPO0ErD0bPsKuJ8=",
+      "dev": true,
+      "requires": {
+        "gulp-util": "3.0.8",
+        "map-stream": "0.0.7",
+        "through": "2.3.8"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+          "dev": true
+        },
+        "dateformat": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz",
+          "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=",
+          "dev": true
+        },
+        "gulp-util": {
+          "version": "3.0.8",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
+          "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
+          "dev": true,
+          "requires": {
+            "array-differ": "1.0.0",
+            "array-uniq": "1.0.3",
+            "beeper": "1.1.1",
+            "chalk": "1.1.3",
+            "dateformat": "2.0.0",
+            "fancy-log": "1.3.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.6.2",
+            "minimist": "1.2.0",
+            "multipipe": "0.1.2",
+            "object-assign": "3.0.0",
+            "replace-ext": "0.0.1",
+            "through2": "2.0.1",
+            "vinyl": "0.5.3"
+          }
+        },
+        "lodash.template": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+          "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+          "dev": true,
+          "requires": {
+            "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": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+          "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+          "dev": true,
+          "requires": {
+            "lodash._reinterpolate": "3.0.0",
+            "lodash.escape": "3.2.0"
+          }
+        },
+        "map-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
+          "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
+          "dev": true
+        },
+        "object-assign": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+          "dev": true
+        },
+        "vinyl": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
+          "dev": true,
+          "requires": {
+            "clone": "1.0.2",
+            "clone-stats": "0.0.1",
+            "replace-ext": "0.0.1"
+          }
+        }
+      }
+    },
+    "gulp-typescript": {
+      "version": "2.13.6",
+      "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-2.13.6.tgz",
+      "integrity": "sha1-r5Nbg048JNUxqVNZf1vlcoY2FYY=",
+      "dev": true,
+      "requires": {
+        "gulp-util": "3.0.7",
+        "source-map": "0.5.6",
+        "through2": "2.0.1",
+        "typescript": "1.8.10",
+        "vinyl-fs": "2.4.4"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "3.1.0",
+            "path-dirname": "1.0.2"
+          }
+        },
+        "glob-stream": {
+          "version": "5.3.5",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
+          "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
+          "dev": true,
+          "requires": {
+            "extend": "3.0.1",
+            "glob": "5.0.15",
+            "glob-parent": "3.1.0",
+            "micromatch": "2.3.11",
+            "ordered-read-streams": "0.3.0",
+            "through2": "0.6.5",
+            "to-absolute-glob": "0.1.1",
+            "unique-stream": "2.2.1"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.34",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+              "dev": true,
+              "requires": {
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "0.0.1",
+                "string_decoder": "0.10.31"
+              }
+            },
+            "through2": {
+              "version": "0.6.5",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+              "dev": true,
+              "requires": {
+                "readable-stream": "1.0.34",
+                "xtend": "4.0.1"
+              }
+            }
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "ordered-read-streams": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
+          "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
+          "dev": true,
+          "requires": {
+            "is-stream": "1.1.0",
+            "readable-stream": "2.3.3"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "typescript": {
+          "version": "1.8.10",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz",
+          "integrity": "sha1-tHXW4N/wv1DyluXKbvn7tccyDx4=",
+          "dev": true
+        },
+        "unique-stream": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
+          "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
+          "dev": true,
+          "requires": {
+            "json-stable-stringify": "1.0.1",
+            "through2-filter": "2.0.0"
+          }
+        },
+        "vinyl-fs": {
+          "version": "2.4.4",
+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
+          "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
+          "dev": true,
+          "requires": {
+            "duplexify": "3.5.0",
+            "glob-stream": "5.3.5",
+            "graceful-fs": "4.1.11",
+            "gulp-sourcemaps": "1.6.0",
+            "is-valid-glob": "0.3.0",
+            "lazystream": "1.0.0",
+            "lodash.isequal": "4.5.0",
+            "merge-stream": "1.0.1",
+            "mkdirp": "0.5.1",
+            "object-assign": "4.1.1",
+            "readable-stream": "2.3.3",
+            "strip-bom": "2.0.0",
+            "strip-bom-stream": "1.0.0",
+            "through2": "2.0.1",
+            "through2-filter": "2.0.0",
+            "vali-date": "1.0.0",
+            "vinyl": "1.2.0"
+          }
+        }
+      }
+    },
+    "gulp-uglify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-2.0.0.tgz",
+      "integrity": "sha1-y+Sq5P4La912AzW8RvIA//aZxK8=",
+      "dev": true,
+      "requires": {
+        "gulplog": "1.0.0",
+        "has-gulplog": "0.1.0",
+        "lodash": "4.17.4",
+        "make-error-cause": "1.2.2",
+        "through2": "2.0.1",
+        "uglify-js": "2.7.0",
+        "uglify-save-license": "0.4.1",
+        "vinyl-sourcemaps-apply": "0.2.1"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.2.10",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+          "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "requires": {
+            "center-align": "0.1.3",
+            "right-align": "0.1.3",
+            "wordwrap": "0.0.2"
+          }
+        },
+        "uglify-js": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.0.tgz",
+          "integrity": "sha1-8CHji6LKdAhg9b1caVwqgXNF8Ow=",
+          "dev": true,
+          "requires": {
+            "async": "0.2.10",
+            "source-map": "0.5.6",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.10.0"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "requires": {
+            "camelcase": "1.2.1",
+            "cliui": "2.1.0",
+            "decamelize": "1.2.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
+    },
+    "gulp-util": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
+      "integrity": "sha1-eJJcS4+LSQBawBoBHFV+YhiUHLs=",
+      "dev": true,
+      "requires": {
+        "array-differ": "1.0.0",
+        "array-uniq": "1.0.3",
+        "beeper": "1.1.1",
+        "chalk": "1.1.3",
+        "dateformat": "1.0.12",
+        "fancy-log": "1.3.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.6.2",
+        "minimist": "1.2.0",
+        "multipipe": "0.1.2",
+        "object-assign": "3.0.0",
+        "replace-ext": "0.0.1",
+        "through2": "2.0.1",
+        "vinyl": "0.5.3"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+          "dev": true
+        },
+        "lodash.template": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+          "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+          "dev": true,
+          "requires": {
+            "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": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+          "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+          "dev": true,
+          "requires": {
+            "lodash._reinterpolate": "3.0.0",
+            "lodash.escape": "3.2.0"
+          }
+        },
+        "object-assign": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+          "dev": true
+        },
+        "vinyl": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
+          "dev": true,
+          "requires": {
+            "clone": "1.0.2",
+            "clone-stats": "0.0.1",
+            "replace-ext": "0.0.1"
+          }
+        }
+      }
+    },
+    "gulp-watch": {
+      "version": "4.3.9",
+      "resolved": "https://registry.npmjs.org/gulp-watch/-/gulp-watch-4.3.9.tgz",
+      "integrity": "sha1-2/UdKpzTgwPsXq4nIKwDfGbQovU=",
+      "dev": true,
+      "requires": {
+        "anymatch": "1.3.0",
+        "chokidar": "1.7.0",
+        "glob-parent": "2.0.0",
+        "gulp-util": "3.0.7",
+        "object-assign": "4.1.1",
+        "path-is-absolute": "1.0.1",
+        "readable-stream": "2.3.3",
+        "vinyl": "0.5.3",
+        "vinyl-file": "1.3.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+          "dev": true
+        },
+        "vinyl": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
+          "dev": true,
+          "requires": {
+            "clone": "1.0.2",
+            "clone-stats": "0.0.1",
+            "replace-ext": "0.0.1"
+          }
+        }
+      }
+    },
+    "gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+      "dev": true,
+      "requires": {
+        "glogg": "1.0.0"
+      }
+    },
+    "handlebars": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
+      "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
+      "dev": true,
+      "requires": {
+        "async": "1.5.2",
+        "optimist": "0.6.1",
+        "source-map": "0.4.4",
+        "uglify-js": "2.8.27"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "har-schema": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+      "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "commander": "2.11.0",
+        "is-my-json-valid": "2.16.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "has-binary": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz",
+      "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=",
+      "dev": true,
+      "requires": {
+        "isarray": "0.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        }
+      }
+    },
+    "has-cors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+      "dev": true
+    },
+    "has-glob": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-0.1.1.tgz",
+      "integrity": "sha1-omHEwqbGZ+DHe3AKfyl8Oe86pYk=",
+      "dev": true,
+      "requires": {
+        "is-glob": "2.0.1"
+      }
+    },
+    "has-gulplog": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
+      "dev": true,
+      "requires": {
+        "sparkles": "1.0.0"
+      }
+    },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "dev": true
+    },
+    "hash-base": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
+      "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.0"
+      }
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "dev": true,
+      "requires": {
+        "boom": "2.10.1",
+        "cryptiles": "2.0.5",
+        "hoek": "2.16.3",
+        "sntp": "1.0.9"
+      }
+    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
+    "header-case": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz",
+      "integrity": "sha1-lTWXMZfBRLCWE81l0xfvGZY70C0=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.1",
+        "upper-case": "1.1.3"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "1.1.3",
+        "minimalistic-assert": "1.0.0",
+        "minimalistic-crypto-utils": "1.0.1"
+      }
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "dev": true
+    },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
+      "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "1.0.0"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
+      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
+      "dev": true
+    },
+    "html-entities": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.0.tgz",
+      "integrity": "sha1-QZSMr4XOgv7Tbk5qDtNxpmZDeeI=",
+      "dev": true
+    },
+    "html-minifier": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.2.tgz",
+      "integrity": "sha1-1zvD/0SJQkCIGM5gm/P7DqfvTrc=",
+      "dev": true,
+      "requires": {
+        "camel-case": "3.0.0",
+        "clean-css": "4.1.7",
+        "commander": "2.9.0",
+        "he": "1.1.1",
+        "ncname": "1.0.0",
+        "param-case": "2.1.1",
+        "relateurl": "0.2.7",
+        "uglify-js": "3.0.24"
+      },
+      "dependencies": {
+        "clean-css": {
+          "version": "4.1.7",
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.7.tgz",
+          "integrity": "sha1-ua6k+FZ5iJzz6ui0A0nsTr390DI=",
+          "dev": true,
+          "requires": {
+            "source-map": "0.5.6"
+          }
+        },
+        "commander": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+          "dev": true,
+          "requires": {
+            "graceful-readlink": "1.0.1"
+          }
+        },
+        "uglify-js": {
+          "version": "3.0.24",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.24.tgz",
+          "integrity": "sha512-IZ7l7MU2j7LIuz6IAFWBOk1dbuQ0QVQsKLffpNPKXuL8NYcFBBQ5QkvMAtfL1+oaBW16344DY4sA26GI9cXzlA==",
+          "dev": true,
+          "requires": {
+            "commander": "2.9.0",
+            "source-map": "0.5.6"
+          }
+        }
+      }
+    },
+    "htmlparser2": {
+      "version": "3.9.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
+      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.3.0",
+        "domhandler": "2.4.1",
+        "domutils": "1.6.2",
+        "entities": "1.1.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "http-errors": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz",
+      "integrity": "sha1-X4uO2YrKVFZWv1cplzh/kEpyIlc=",
+      "dev": true,
+      "requires": {
+        "depd": "1.1.0",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.0.3",
+        "statuses": "1.3.1"
+      }
+    },
+    "http-proxy": {
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz",
+      "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "1.2.0",
+        "requires-port": "1.0.0"
+      }
+    },
+    "http-signature": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "0.2.0",
+        "jsprim": "1.4.0",
+        "sshpk": "1.13.1"
+      }
+    },
+    "https-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
+      "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
+      "dev": true
+    },
+    "https-proxy-agent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
+      "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
+      "dev": true,
+      "requires": {
+        "agent-base": "2.1.1",
+        "debug": "2.6.8",
+        "extend": "3.0.1"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz",
+      "integrity": "sha1-LstC/SlHRJIiCaLnxATayHk9it4=",
+      "dev": true
+    },
+    "idb-wrapper": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/idb-wrapper/-/idb-wrapper-1.7.1.tgz",
+      "integrity": "sha1-ajJnASLhc6hOzFz6lmj6LOsiGwQ=",
+      "dev": true
+    },
+    "ieee754": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
+      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
+      "dev": true
+    },
+    "import-lazy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
+      "dev": true
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "in-publish": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.0.1.tgz",
+      "integrity": "sha1-bfv/r01pfddsj+NJ+RneAcKK/E0=",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "1.4.0",
+        "chalk": "1.1.3",
+        "cli-cursor": "2.1.0",
+        "cli-width": "2.1.0",
+        "external-editor": "2.0.4",
+        "figures": "2.0.0",
+        "lodash": "4.17.4",
+        "mute-stream": "0.0.7",
+        "run-async": "2.3.0",
+        "rx": "4.1.0",
+        "string-width": "2.1.0",
+        "strip-ansi": "3.0.1",
+        "through": "2.3.8"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz",
+          "integrity": "sha1-AwZkVh/BRslCPsfZeP4kV0N/5tA=",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "3.0.0"
+              }
+            }
+          }
+        }
+      }
+    },
+    "interpret": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
+      "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=",
+      "dev": true
+    },
+    "invariant": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+      "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
+      "dev": true,
+      "requires": {
+        "loose-envify": "1.3.1"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
+    "ionic-cz-conventional-changelog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ionic-cz-conventional-changelog/-/ionic-cz-conventional-changelog-1.0.0.tgz",
+      "integrity": "sha1-9mk3AOgLWmEA5uZn848AGF7TLU4=",
+      "dev": true,
+      "requires": {
+        "colors": "1.1.2",
+        "word-wrap": "1.2.3"
+      }
+    },
+    "ionic-native": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/ionic-native/-/ionic-native-2.9.0.tgz",
+      "integrity": "sha1-6aNshQ7aGAkYQHwojl1jSXjjIFI=",
+      "dev": true,
+      "requires": {
+        "rxjs": "5.0.1"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.1.tgz",
+          "integrity": "sha1-Omm9+fDKCphjAzcNRwj3K9+sg1Y=",
+          "dev": true,
+          "requires": {
+            "symbol-observable": "1.0.4"
+          }
+        }
+      }
+    },
+    "ionicons": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-3.0.0.tgz",
+      "integrity": "sha1-QLja9P16MRUL0AIWD2ZJbiKpjDw="
+    },
+    "ipaddr.js": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz",
+      "integrity": "sha1-HgOlL9rYOou7KyXL9JmLTP/NPew=",
+      "dev": true
+    },
+    "is": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/is/-/is-0.2.7.tgz",
+      "integrity": "sha1-OzSixI81mXLzUEKEkZOucmS2NWI=",
+      "dev": true
+    },
+    "is-absolute": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
+      "integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=",
+      "dev": true,
+      "requires": {
+        "is-relative": "0.2.1",
+        "is-windows": "0.2.0"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "1.8.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
+      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
+      "dev": true
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "1.1.1"
+      }
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+      "dev": true
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "dev": true,
+      "requires": {
+        "is-primitive": "2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "is-lower-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz",
+      "integrity": "sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=",
+      "dev": true,
+      "requires": {
+        "lower-case": "1.1.4"
+      }
+    },
+    "is-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
+      "dev": true
+    },
+    "is-my-json-valid": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
+      "integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=",
+      "dev": true,
+      "requires": {
+        "generate-function": "2.0.0",
+        "generate-object-property": "1.2.0",
+        "jsonpointer": "4.0.1",
+        "xtend": "4.0.1"
+      }
+    },
+    "is-npm": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
+      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
+      "dev": true
+    },
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "dev": true
+    },
+    "is-object": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz",
+      "integrity": "sha1-AO+8CIFsM8/ErIJR0TLhDcZQmNc=",
+      "dev": true
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
+      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
+      "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "1.0.2"
+      }
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+      "dev": true
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
+      "dev": true
+    },
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+      "dev": true
+    },
+    "is-relative": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz",
+      "integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=",
+      "dev": true,
+      "requires": {
+        "is-unc-path": "0.1.2"
+      }
+    },
+    "is-retry-allowed": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-subset": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
+      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
+      "dev": true
+    },
+    "is-text-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
+      "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
+      "dev": true,
+      "requires": {
+        "text-extensions": "1.5.0"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-unc-path": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz",
+      "integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=",
+      "dev": true,
+      "requires": {
+        "unc-path-regex": "0.1.2"
+      }
+    },
+    "is-upper-case": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz",
+      "integrity": "sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=",
+      "dev": true,
+      "requires": {
+        "upper-case": "1.1.3"
+      }
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "is-valid-glob": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
+      "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
+      "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isbinaryfile": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz",
+      "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=",
+      "dev": true
+    },
+    "isbuffer": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/isbuffer/-/isbuffer-0.0.0.tgz",
+      "integrity": "sha1-OMFG2d9Si4v5sHAcPUPPEt8/w5s=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "requires": {
+        "isarray": "1.0.0"
+      }
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "istanbul": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
+      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1.0.9",
+        "async": "1.5.2",
+        "escodegen": "1.8.1",
+        "esprima": "2.7.3",
+        "glob": "5.0.15",
+        "handlebars": "4.0.10",
+        "js-yaml": "3.9.0",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "once": "1.4.0",
+        "resolve": "1.1.7",
+        "supports-color": "3.2.3",
+        "which": "1.2.14",
+        "wordwrap": "1.0.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
+          "dev": true
+        },
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        },
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        },
+        "wordwrap": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+          "dev": true
+        }
+      }
+    },
+    "jasmine": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.6.0.tgz",
+      "integrity": "sha1-ayLnCIPo5YnUVjRhU7TSBt2+IX8=",
+      "dev": true,
+      "requires": {
+        "exit": "0.1.2",
+        "glob": "7.0.6",
+        "jasmine-core": "2.6.4"
+      },
+      "dependencies": {
+        "jasmine-core": {
+          "version": "2.6.4",
+          "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.4.tgz",
+          "integrity": "sha1-3skmzQqfoof7bbXHVfpIfnTOysU=",
+          "dev": true
+        }
+      }
+    },
+    "jasmine-core": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.5.2.tgz",
+      "integrity": "sha1-b2G9eQYeJ/Q+b5NV5Es8bKtv8pc=",
+      "dev": true
+    },
+    "jasmine-growl-reporter": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/jasmine-growl-reporter/-/jasmine-growl-reporter-0.0.3.tgz",
+      "integrity": "sha1-uHrlUeNZ0orVIXdl6u9sB7dj9sg=",
+      "dev": true,
+      "requires": {
+        "growl": "1.7.0"
+      }
+    },
+    "jasmine-node": {
+      "version": "1.14.5",
+      "resolved": "https://registry.npmjs.org/jasmine-node/-/jasmine-node-1.14.5.tgz",
+      "integrity": "sha1-GOg5e4VpJO53ADZmw3MbWupQw50=",
+      "dev": true,
+      "requires": {
+        "coffee-script": "1.12.6",
+        "gaze": "0.3.4",
+        "jasmine-growl-reporter": "0.0.3",
+        "jasmine-reporters": "1.0.2",
+        "mkdirp": "0.3.5",
+        "requirejs": "2.3.3",
+        "underscore": "1.6.0",
+        "walkdir": "0.0.11"
+      },
+      "dependencies": {
+        "gaze": {
+          "version": "0.3.4",
+          "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.3.4.tgz",
+          "integrity": "sha1-X5S92gr+U7xxCWm81vKCVI1gwnk=",
+          "dev": true,
+          "requires": {
+            "fileset": "0.1.8",
+            "minimatch": "0.2.14"
+          }
+        },
+        "lru-cache": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+          "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "0.2.14",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "2.7.3",
+            "sigmund": "1.0.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
+          "dev": true
+        }
+      }
+    },
+    "jasmine-reporters": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/jasmine-reporters/-/jasmine-reporters-1.0.2.tgz",
+      "integrity": "sha1-q2E+1Zd9x0h+hbPBL2qOqNsq3jE=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "0.3.5"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
+          "dev": true
+        }
+      }
+    },
+    "jasminewd2": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.1.0.tgz",
+      "integrity": "sha1-2llSddGuYx3nNqwKfH2Fyfc+9lI=",
+      "dev": true
+    },
+    "js-base64": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
+      "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz",
+      "integrity": "sha512-0LoUNELX4S+iofCT8f4uEHIiRBR+c2AINyC8qRWfC6QNruLtxVZRJaPcu/xwMgFIgDxF25tGHaDjvxzJCNE9yw==",
+      "dev": true,
+      "requires": {
+        "argparse": "1.0.9",
+        "esprima": "4.0.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+          "dev": true
+        }
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true,
+      "optional": true
+    },
+    "jschardet": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz",
+      "integrity": "sha1-KqEH8UKvQSHRRWWdRPUIMJYeaZo=",
+      "dev": true
+    },
+    "jsesc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+      "dev": true
+    },
+    "json-loader": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz",
+      "integrity": "sha1-i6oTZaYy9Yo8RtIBdfxgAsluN94=",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "dev": true,
+      "requires": {
+        "jsonify": "0.0.0"
+      }
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json3": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz",
+      "integrity": "sha1-9u/JPAagTemuxTBT3yVZuxniA4s=",
+      "dev": true
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "dev": true
+    },
+    "jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true
+    },
+    "jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+      "dev": true
+    },
+    "jsonpointer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
+      "dev": true
+    },
+    "JSONStream": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
+      "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
+      "dev": true,
+      "requires": {
+        "jsonparse": "1.3.1",
+        "through": "2.3.8"
+      }
+    },
+    "jsprim": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
+      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.0.2",
+        "json-schema": "0.2.3",
+        "verror": "1.3.6"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "karma": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz",
+      "integrity": "sha1-srlOj0mfrdAGnVT5rvSk1I7FzB8=",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.0",
+        "body-parser": "1.13.3",
+        "chokidar": "1.7.0",
+        "colors": "1.1.2",
+        "combine-lists": "1.0.1",
+        "connect": "3.5.0",
+        "core-js": "2.4.1",
+        "di": "0.0.1",
+        "dom-serialize": "2.2.1",
+        "expand-braces": "0.1.2",
+        "glob": "7.0.6",
+        "graceful-fs": "4.1.11",
+        "http-proxy": "1.16.2",
+        "isbinaryfile": "3.0.2",
+        "lodash": "3.10.1",
+        "log4js": "0.6.38",
+        "mime": "1.3.4",
+        "minimatch": "3.0.4",
+        "optimist": "0.6.1",
+        "qjobs": "1.1.5",
+        "range-parser": "1.2.0",
+        "rimraf": "2.6.1",
+        "socket.io": "1.4.7",
+        "source-map": "0.5.6",
+        "tmp": "0.0.28",
+        "useragent": "2.2.1"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "dev": true
+        },
+        "tmp": {
+          "version": "0.0.28",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz",
+          "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=",
+          "dev": true,
+          "requires": {
+            "os-tmpdir": "1.0.2"
+          }
+        }
+      }
+    },
+    "karma-chrome-launcher": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.0.0.tgz",
+      "integrity": "sha1-wnkMWjKxVXfQ//Wk1aJwOztDnCU=",
+      "dev": true,
+      "requires": {
+        "fs-access": "1.0.1",
+        "which": "1.2.14"
+      }
+    },
+    "karma-coverage": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.1.tgz",
+      "integrity": "sha1-Wv+LOc9plNwi3kyENix2ABtjfPY=",
+      "dev": true,
+      "requires": {
+        "dateformat": "1.0.12",
+        "istanbul": "0.4.5",
+        "lodash": "3.10.1",
+        "minimatch": "3.0.4",
+        "source-map": "0.5.6"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "dev": true
+        }
+      }
+    },
+    "karma-jasmine": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.0.2.tgz",
+      "integrity": "sha1-wLOrMnvyB9tg4X+ifbN8/e9djmw=",
+      "dev": true
+    },
+    "karma-sourcemap-loader": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz",
+      "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "karma-spec-reporter": {
+      "version": "0.0.26",
+      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.26.tgz",
+      "integrity": "sha1-v1VhN33OG2PPLJdcGvPjXxmeImU=",
+      "dev": true,
+      "requires": {
+        "colors": "0.6.2"
+      },
+      "dependencies": {
+        "colors": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+          "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=",
+          "dev": true
+        }
+      }
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "requires": {
+        "is-buffer": "1.1.5"
+      }
+    },
+    "latest-version": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
+      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
+      "dev": true,
+      "requires": {
+        "package-json": "4.0.1"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true
+    },
+    "lazystream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "1.0.0"
+      }
+    },
+    "level-blobs": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/level-blobs/-/level-blobs-0.1.7.tgz",
+      "integrity": "sha1-mrm5e7mfHtv594o0M+Ie1WOGva8=",
+      "dev": true,
+      "requires": {
+        "level-peek": "1.0.6",
+        "once": "1.4.0",
+        "readable-stream": "1.1.14"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "level-filesystem": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/level-filesystem/-/level-filesystem-1.2.0.tgz",
+      "integrity": "sha1-oArKmRnEpN+v3KaoEI0iWq3/Y7M=",
+      "dev": true,
+      "requires": {
+        "concat-stream": "1.6.0",
+        "errno": "0.1.4",
+        "fwd-stream": "1.0.4",
+        "level-blobs": "0.1.7",
+        "level-peek": "1.0.6",
+        "level-sublevel": "5.2.3",
+        "octal": "1.0.0",
+        "once": "1.4.0",
+        "xtend": "2.2.0"
+      },
+      "dependencies": {
+        "xtend": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.2.0.tgz",
+          "integrity": "sha1-7vax8ZjByN6vrYsXZaBNrUoBxak=",
+          "dev": true
+        }
+      }
+    },
+    "level-fix-range": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/level-fix-range/-/level-fix-range-1.0.2.tgz",
+      "integrity": "sha1-vxW5Fa422EcMgh6IPd95zRZCCCg=",
+      "dev": true
+    },
+    "level-hooks": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/level-hooks/-/level-hooks-4.5.0.tgz",
+      "integrity": "sha1-G5rmGSKTDzMF0aYfxNg8gQLA3ZM=",
+      "dev": true,
+      "requires": {
+        "string-range": "1.2.2"
+      }
+    },
+    "level-js": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/level-js/-/level-js-2.2.4.tgz",
+      "integrity": "sha1-vAVfQYBjXUSJtWHJSG+jcOjBFpc=",
+      "dev": true,
+      "requires": {
+        "abstract-leveldown": "0.12.4",
+        "idb-wrapper": "1.7.1",
+        "isbuffer": "0.0.0",
+        "ltgt": "2.2.0",
+        "typedarray-to-buffer": "1.0.4",
+        "xtend": "2.1.2"
+      },
+      "dependencies": {
+        "object-keys": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+          "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
+          "dev": true
+        },
+        "xtend": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+          "dev": true,
+          "requires": {
+            "object-keys": "0.4.0"
+          }
+        }
+      }
+    },
+    "level-peek": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/level-peek/-/level-peek-1.0.6.tgz",
+      "integrity": "sha1-vsUccqgu5GTTNkNMfIdsP8vM538=",
+      "dev": true,
+      "requires": {
+        "level-fix-range": "1.0.2"
+      }
+    },
+    "level-sublevel": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/level-sublevel/-/level-sublevel-5.2.3.tgz",
+      "integrity": "sha1-dEwSxy0ucr543eO5tc2E1iGRQTo=",
+      "dev": true,
+      "requires": {
+        "level-fix-range": "2.0.0",
+        "level-hooks": "4.5.0",
+        "string-range": "1.2.2",
+        "xtend": "2.0.6"
+      },
+      "dependencies": {
+        "level-fix-range": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/level-fix-range/-/level-fix-range-2.0.0.tgz",
+          "integrity": "sha1-xBfWIVlEIVGhnZojZ4aPFyTC1Ug=",
+          "dev": true,
+          "requires": {
+            "clone": "0.1.19"
+          }
+        },
+        "xtend": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz",
+          "integrity": "sha1-XqZXptukRwacLlnFihE4ywxebO4=",
+          "dev": true,
+          "requires": {
+            "is-object": "0.1.2",
+            "object-keys": "0.2.0"
+          }
+        }
+      }
+    },
+    "levelup": {
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz",
+      "integrity": "sha1-5qAcsIlhbI7MApHCqb0/DETj5es=",
+      "dev": true,
+      "requires": {
+        "bl": "0.8.2",
+        "deferred-leveldown": "0.2.0",
+        "errno": "0.1.4",
+        "prr": "0.0.0",
+        "readable-stream": "1.0.34",
+        "semver": "2.3.2",
+        "xtend": "3.0.0"
+      },
+      "dependencies": {
+        "bl": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz",
+          "integrity": "sha1-yba8oI0bwuoA/Ir7Txpf0eHGbk4=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "semver": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz",
+          "integrity": "sha1-uYSPJdbPNjMwc+ye+IVtQvEjPlI=",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "xtend": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
+          "dev": true
+        }
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
+      }
+    },
+    "liftoff": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz",
+      "integrity": "sha1-qY8v9nGD2Lp8+soQVIvX/wVQs4U=",
+      "dev": true,
+      "requires": {
+        "extend": "3.0.1",
+        "findup-sync": "0.4.3",
+        "fined": "1.1.0",
+        "flagged-respawn": "0.3.2",
+        "lodash.isplainobject": "4.0.6",
+        "lodash.isstring": "4.0.1",
+        "lodash.mapvalues": "4.6.0",
+        "rechoir": "0.6.2",
+        "resolve": "1.3.3"
+      },
+      "dependencies": {
+        "findup-sync": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz",
+          "integrity": "sha1-QAQ5Kee8YK3wt/SCfExudaDeyhI=",
+          "dev": true,
+          "requires": {
+            "detect-file": "0.1.0",
+            "is-glob": "2.0.1",
+            "micromatch": "2.3.11",
+            "resolve-dir": "0.1.1"
+          }
+        }
+      }
+    },
+    "livereload-js": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.2.2.tgz",
+      "integrity": "sha1-bIclfmSKtHW8JOoldFftzB+NC8I=",
+      "dev": true
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
+      }
+    },
+    "loader-runner": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz",
+      "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "0.2.17",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+      "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+      "dev": true,
+      "requires": {
+        "big.js": "3.1.3",
+        "emojis-list": "2.1.0",
+        "json5": "0.5.1",
+        "object-assign": "4.1.1"
+      }
+    },
+    "lodash": {
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+      "dev": true
+    },
+    "lodash._basebind": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz",
+      "integrity": "sha1-6UC5690nwyfgqNqxtVkWxTQelXU=",
+      "dev": true,
+      "requires": {
+        "lodash._basecreate": "2.4.1",
+        "lodash._setbinddata": "2.4.1",
+        "lodash._slice": "2.4.1",
+        "lodash.isobject": "2.4.1"
+      }
+    },
+    "lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "dev": true
+    },
+    "lodash._basecreate": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
+      "integrity": "sha1-+Ob1tXip405UEXm1a47uv0oofgg=",
+      "dev": true,
+      "requires": {
+        "lodash._isnative": "2.4.1",
+        "lodash.isobject": "2.4.1",
+        "lodash.noop": "2.4.1"
+      }
+    },
+    "lodash._basecreatecallback": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz",
+      "integrity": "sha1-fQsmdknLKeehOdAQO3wR+uhOSFE=",
+      "dev": true,
+      "requires": {
+        "lodash._setbinddata": "2.4.1",
+        "lodash.bind": "2.4.1",
+        "lodash.identity": "2.4.1",
+        "lodash.support": "2.4.1"
+      }
+    },
+    "lodash._basecreatewrapper": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz",
+      "integrity": "sha1-TTHy595+E0+/KAN2K4FQsyUZZm8=",
+      "dev": true,
+      "requires": {
+        "lodash._basecreate": "2.4.1",
+        "lodash._setbinddata": "2.4.1",
+        "lodash._slice": "2.4.1",
+        "lodash.isobject": "2.4.1"
+      }
+    },
+    "lodash._basetostring": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
+      "dev": true
+    },
+    "lodash._basevalues": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
+      "dev": true
+    },
+    "lodash._createwrapper": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz",
+      "integrity": "sha1-UdaVeXPaTtVW43KQ2MGhjFPeFgc=",
+      "dev": true,
+      "requires": {
+        "lodash._basebind": "2.4.1",
+        "lodash._basecreatewrapper": "2.4.1",
+        "lodash._slice": "2.4.1",
+        "lodash.isfunction": "2.4.1"
+      }
+    },
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "dev": true
+    },
+    "lodash._isnative": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
+      "dev": true
+    },
+    "lodash._objecttypes": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
+      "dev": true
+    },
+    "lodash._reescape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
+      "dev": true
+    },
+    "lodash._reevaluate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
+      "dev": true
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "dev": true
+    },
+    "lodash._root": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
+      "dev": true
+    },
+    "lodash._setbinddata": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz",
+      "integrity": "sha1-98IAzRuS7yNrOZ7s9zxkjReqlNI=",
+      "dev": true,
+      "requires": {
+        "lodash._isnative": "2.4.1",
+        "lodash.noop": "2.4.1"
+      }
+    },
+    "lodash._shimkeys": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
+      "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
+      "dev": true,
+      "requires": {
+        "lodash._objecttypes": "2.4.1"
+      }
+    },
+    "lodash._slice": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz",
+      "integrity": "sha1-dFz0GlNZexj2iImFREBe+isG2Q8=",
+      "dev": true
+    },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "dev": true
+    },
+    "lodash.bind": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz",
+      "integrity": "sha1-XRn6AFyMTSNvr0dCx7eh/Kvikmc=",
+      "dev": true,
+      "requires": {
+        "lodash._createwrapper": "2.4.1",
+        "lodash._slice": "2.4.1"
+      }
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "lodash.defaults": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+      "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
+      "dev": true,
+      "requires": {
+        "lodash._objecttypes": "2.4.1",
+        "lodash.keys": "2.4.1"
+      },
+      "dependencies": {
+        "lodash.keys": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
+          "dev": true,
+          "requires": {
+            "lodash._isnative": "2.4.1",
+            "lodash._shimkeys": "2.4.1",
+            "lodash.isobject": "2.4.1"
+          }
+        }
+      }
+    },
+    "lodash.difference": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
+      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
+      "dev": true
+    },
+    "lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
+      "dev": true,
+      "requires": {
+        "lodash._root": "3.0.1"
+      }
+    },
+    "lodash.identity": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz",
+      "integrity": "sha1-ZpTP+mX++TH3wxzobHRZfPVg9PE=",
+      "dev": true
+    },
+    "lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+      "dev": true
+    },
+    "lodash.isfunction": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz",
+      "integrity": "sha1-LP1XXHPkmKtX4xm3f6Aq3vE6lNE=",
+      "dev": true
+    },
+    "lodash.isobject": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+      "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
+      "dev": true,
+      "requires": {
+        "lodash._objecttypes": "2.4.1"
+      }
+    },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
+      "dev": true
+    },
+    "lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=",
+      "dev": true
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "requires": {
+        "lodash._getnative": "3.9.1",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isarray": "3.0.4"
+      }
+    },
+    "lodash.mapvalues": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
+      "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=",
+      "dev": true
+    },
+    "lodash.mergewith": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz",
+      "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=",
+      "dev": true
+    },
+    "lodash.noop": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz",
+      "integrity": "sha1-T7VPgWZS5a4Q6PcvcXo4jHMmU4o=",
+      "dev": true
+    },
+    "lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+      "dev": true
+    },
+    "lodash.some": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
+      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
+      "dev": true
+    },
+    "lodash.support": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz",
+      "integrity": "sha1-Mg4LZwMWc8KNeiu12eAzGkUkBRU=",
+      "dev": true,
+      "requires": {
+        "lodash._isnative": "2.4.1"
+      }
+    },
+    "lodash.template": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
+      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.templatesettings": "4.1.0"
+      }
+    },
+    "lodash.templatesettings": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
+      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "3.0.0"
+      }
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "log4js": {
+      "version": "0.6.38",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
+      "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "1.0.34",
+        "semver": "4.3.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+      "dev": true,
+      "requires": {
+        "js-tokens": "3.0.2"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "lower-case-first": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz",
+      "integrity": "sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=",
+      "dev": true,
+      "requires": {
+        "lower-case": "1.1.4"
+      }
+    },
+    "lowercase-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+      "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
+      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
+      }
+    },
+    "ltgt": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.0.tgz",
+      "integrity": "sha1-tlul/LNJopkkyOMz98alVi8uSEI=",
+      "dev": true
+    },
+    "macos-release": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
+      "integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==",
+      "dev": true
+    },
+    "magic-string": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.19.1.tgz",
+      "integrity": "sha1-FNdoATyvLsj96hakmvgvw3fnUgE=",
+      "dev": true,
+      "requires": {
+        "vlq": "0.2.2"
+      }
+    },
+    "make-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
+      "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
+      "dev": true,
+      "requires": {
+        "pify": "2.3.0"
+      }
+    },
+    "make-error": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz",
+      "integrity": "sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y=",
+      "dev": true
+    },
+    "make-error-cause": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz",
+      "integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=",
+      "dev": true,
+      "requires": {
+        "make-error": "1.3.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
+    "map-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
+      "dev": true
+    },
+    "markdown": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/markdown/-/markdown-0.5.0.tgz",
+      "integrity": "sha1-KCBbVlqK51kt4gdGPWY33BgnIrI=",
+      "dev": true,
+      "requires": {
+        "nopt": "2.1.2"
+      },
+      "dependencies": {
+        "nopt": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
+          "integrity": "sha1-bMzZd7gBMqB3MdbozljCyDA8+a8=",
+          "dev": true,
+          "requires": {
+            "abbrev": "1.1.0"
+          }
+        }
+      }
+    },
+    "marked": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
+      "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc=",
+      "dev": true
+    },
+    "matched": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/matched/-/matched-0.4.4.tgz",
+      "integrity": "sha1-Vte36xgDPwz5vFLrIJD6x9weifo=",
+      "dev": true,
+      "requires": {
+        "arr-union": "3.1.0",
+        "async-array-reduce": "0.2.1",
+        "extend-shallow": "2.0.1",
+        "fs-exists-sync": "0.1.0",
+        "glob": "7.0.6",
+        "has-glob": "0.1.1",
+        "is-valid-glob": "0.3.0",
+        "lazy-cache": "2.0.2",
+        "resolve-dir": "0.1.1"
+      },
+      "dependencies": {
+        "lazy-cache": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz",
+          "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=",
+          "dev": true,
+          "requires": {
+            "set-getter": "0.1.0"
+          }
+        }
+      }
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
+    "memoize-decorator": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/memoize-decorator/-/memoize-decorator-1.0.2.tgz",
+      "integrity": "sha1-YFpBcVxBcdsZKpAJiwCrjW4RAvU=",
+      "dev": true
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "0.1.4",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "requires": {
+        "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"
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "dev": true
+    },
+    "merge-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
+      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
+    "merge2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.0.2.tgz",
+      "integrity": "sha1-3TlOoU4LICwmW1Z5cLqBNuEAO9s=",
+      "dev": true
+    },
+    "method-override": {
+      "version": "2.3.9",
+      "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.9.tgz",
+      "integrity": "sha1-vRUfLONM8Bp2ykAKuVwBKxAtj3E=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.8",
+        "methods": "1.1.2",
+        "parseurl": "1.3.1",
+        "vary": "1.1.1"
+      }
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+      "dev": true,
+      "requires": {
+        "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.3"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
+      "integrity": "sha1-SmL7HUKTPAVYOYL0xxb2+55sbT0=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.7",
+        "brorand": "1.1.0"
+      }
+    },
+    "mime": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
+      "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
+      "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.15",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
+      "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.27.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
+      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
+      "dev": true
+    },
+    "minimalistic-assert": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
+      "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "1.1.8"
+      }
+    },
+    "minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+        }
+      }
+    },
+    "mkdirp-promise": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz",
+      "integrity": "sha1-6bj2jlUsaKnBcTuEiD96HdA5uKE=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "0.5.1"
+      }
+    },
+    "modify-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz",
+      "integrity": "sha1-4rbN65zhn5kxelNyLz2/XfXqqrI=",
+      "dev": true
+    },
+    "morgan": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz",
+      "integrity": "sha1-X9gYOYxoGcuiinzWZk8pL+HAu/I=",
+      "dev": true,
+      "requires": {
+        "basic-auth": "1.0.4",
+        "debug": "2.2.0",
+        "depd": "1.0.1",
+        "on-finished": "2.3.0",
+        "on-headers": "1.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "depd": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz",
+          "integrity": "sha1-gK7GTJ1tl+ZcwqnKqTwKpqv3Oqo=",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "multiparty": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz",
+      "integrity": "sha1-Nd5oBNwZZD5SSfPT473GyM4wHT8=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "1.1.14",
+        "stream-counter": "0.2.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "multipipe": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
+      "dev": true,
+      "requires": {
+        "duplexer2": "0.0.2"
+      }
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
+      "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=",
+      "dev": true
+    },
+    "natives": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz",
+      "integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=",
+      "dev": true
+    },
+    "ncname": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz",
+      "integrity": "sha1-W1etGLHKCShk72Kwse2BlPODtxw=",
+      "dev": true,
+      "requires": {
+        "xml-char-classes": "1.0.0"
+      }
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
+      "dev": true
+    },
+    "no-case": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz",
+      "integrity": "sha1-euuhxzpSGEJlVUt9wDuvcg34AIE=",
+      "dev": true,
+      "requires": {
+        "lower-case": "1.1.4"
+      }
+    },
+    "node-gyp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
+      "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
+      "dev": true,
+      "requires": {
+        "fstream": "1.0.11",
+        "glob": "7.0.6",
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "npmlog": "4.1.2",
+        "osenv": "0.1.4",
+        "request": "2.75.0",
+        "rimraf": "2.6.1",
+        "semver": "5.3.0",
+        "tar": "2.2.1",
+        "which": "1.2.14"
+      }
+    },
+    "node-html-encoder": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/node-html-encoder/-/node-html-encoder-0.0.2.tgz",
+      "integrity": "sha1-iXNhjXJ9pVJqgwtH0HwNgD4KFcY=",
+      "dev": true
+    },
+    "node-libs-browser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz",
+      "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=",
+      "dev": true,
+      "requires": {
+        "assert": "1.4.1",
+        "browserify-zlib": "0.1.4",
+        "buffer": "4.9.1",
+        "console-browserify": "1.1.0",
+        "constants-browserify": "1.0.0",
+        "crypto-browserify": "3.11.1",
+        "domain-browser": "1.1.7",
+        "events": "1.1.1",
+        "https-browserify": "0.0.1",
+        "os-browserify": "0.2.1",
+        "path-browserify": "0.0.0",
+        "process": "0.11.10",
+        "punycode": "1.4.1",
+        "querystring-es3": "0.2.1",
+        "readable-stream": "2.3.3",
+        "stream-browserify": "2.0.1",
+        "stream-http": "2.7.2",
+        "string_decoder": "0.10.31",
+        "timers-browserify": "2.0.2",
+        "tty-browserify": "0.0.0",
+        "url": "0.11.0",
+        "util": "0.10.3",
+        "vm-browserify": "0.0.4"
+      },
+      "dependencies": {
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "node-sass": {
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.5.3.tgz",
+      "integrity": "sha1-0JydEXlkEjnRuX/8YjH9zsU+FWg=",
+      "dev": true,
+      "requires": {
+        "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.0.6",
+        "in-publish": "2.0.0",
+        "lodash.assign": "4.2.0",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.mergewith": "4.6.0",
+        "meow": "3.7.0",
+        "mkdirp": "0.5.1",
+        "nan": "2.6.2",
+        "node-gyp": "3.6.2",
+        "npmlog": "4.1.2",
+        "request": "2.81.0",
+        "sass-graph": "2.2.4",
+        "stdout-stream": "1.4.0"
+      },
+      "dependencies": {
+        "caseless": {
+          "version": "0.12.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+          "dev": true
+        },
+        "cross-spawn": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "4.1.1",
+            "which": "1.2.14"
+          }
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+          "dev": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+          "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+          "dev": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.6.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.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.15",
+            "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.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.1.0"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "uuid": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+          "dev": true
+        }
+      }
+    },
+    "node-uuid": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+      "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
+      "dev": true
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1.1.0"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "2.5.0",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.3.0",
+        "validate-npm-package-license": "3.0.1"
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "1.0.2"
+      }
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "2.0.1"
+      }
+    },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "dev": true,
+      "requires": {
+        "are-we-there-yet": "1.1.4",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
+      }
+    },
+    "null-check": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
+      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
+      "dev": true
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "nunjucks": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-2.5.2.tgz",
+      "integrity": "sha1-6n00bnhbikh0Zmw8yp4YxXf7oiw=",
+      "dev": true,
+      "requires": {
+        "asap": "2.0.6",
+        "chokidar": "1.7.0",
+        "yargs": "3.32.0"
+      },
+      "dependencies": {
+        "window-size": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
+          "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "3.32.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
+          "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
+          "dev": true,
+          "requires": {
+            "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"
+          }
+        }
+      }
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-component": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
+      "dev": true
+    },
+    "object-keys": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz",
+      "integrity": "sha1-zd7AKZiwkb5CvxA1rjLknxy26mc=",
+      "dev": true,
+      "requires": {
+        "foreach": "2.0.5",
+        "indexof": "0.0.1",
+        "is": "0.2.7"
+      }
+    },
+    "object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+      "dev": true,
+      "requires": {
+        "array-each": "1.0.1",
+        "array-slice": "1.0.0",
+        "for-own": "1.0.0",
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "for-own": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+          "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+          "dev": true,
+          "requires": {
+            "for-in": "1.0.2"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "dev": true,
+      "requires": {
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
+      }
+    },
+    "object.pick": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz",
+      "integrity": "sha1-tTkr7peC2m2ft9avr1OXefEjTCs=",
+      "dev": true,
+      "requires": {
+        "isobject": "2.1.0"
+      }
+    },
+    "objectdiff": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/objectdiff/-/objectdiff-1.1.0.tgz",
+      "integrity": "sha1-jXoVvmy4Zw34pJDMa+EqTwXqgvQ=",
+      "dev": true
+    },
+    "octal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz",
+      "integrity": "sha1-Y+cWKmjvvrniE1iNWOmJ0eXEUws=",
+      "dev": true
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
+      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "1.1.0"
+      }
+    },
+    "open": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+      "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=",
+      "dev": true
+    },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.10",
+        "wordwrap": "0.0.3"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
+          "dev": true
+        }
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "requires": {
+        "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": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+          "dev": true
+        }
+      }
+    },
+    "options": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
+      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
+      "dev": true
+    },
+    "orchestrator": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz",
+      "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "0.1.5",
+        "sequencify": "0.0.7",
+        "stream-consume": "0.1.0"
+      }
+    },
+    "ordered-read-streams": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
+      "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=",
+      "dev": true
+    },
+    "os-browserify": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
+      "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
+      "dev": true
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "requires": {
+        "lcid": "1.0.0"
+      }
+    },
+    "os-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz",
+      "integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
+      "dev": true,
+      "requires": {
+        "macos-release": "1.1.0",
+        "win-release": "1.1.1"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "osenv": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "output-file-sync": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
+      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "mkdirp": "0.5.1",
+        "object-assign": "4.1.1"
+      }
+    },
+    "p-all": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-all/-/p-all-1.0.0.tgz",
+      "integrity": "sha1-k731OlWiOCH9+pi0F0qZv38x340=",
+      "dev": true,
+      "requires": {
+        "p-map": "1.1.1"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-map": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.1.1.tgz",
+      "integrity": "sha1-BfXkrpegaDcbwqXMhr+9vBnErno=",
+      "dev": true
+    },
+    "package-json": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+      "dev": true,
+      "requires": {
+        "got": "6.7.1",
+        "registry-auth-token": "3.3.1",
+        "registry-url": "3.1.0",
+        "semver": "5.3.0"
+      }
+    },
+    "pako": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
+      "dev": true
+    },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.1"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
+      "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
+      "dev": true,
+      "requires": {
+        "asn1.js": "4.9.1",
+        "browserify-aes": "1.0.6",
+        "create-hash": "1.1.3",
+        "evp_bytestokey": "1.0.0",
+        "pbkdf2": "3.0.12"
+      }
+    },
+    "parse-filepath": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz",
+      "integrity": "sha1-FZ1hVdQ5BNFsEO9piRHaHpGWm3M=",
+      "dev": true,
+      "requires": {
+        "is-absolute": "0.2.6",
+        "map-cache": "0.2.2",
+        "path-root": "0.1.1"
+      }
+    },
+    "parse-github-repo-url": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.0.tgz",
+      "integrity": "sha1-KGxT4smWLgZBZJ7jrJUI/KTdlZw=",
+      "dev": true
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "dev": true,
+      "requires": {
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "requires": {
+        "error-ex": "1.3.1"
+      }
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
+    },
+    "parsejson": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz",
+      "integrity": "sha1-mxDGwNglq1ieaFFTgm3go7oni8w=",
+      "dev": true,
+      "requires": {
+        "better-assert": "1.0.2"
+      }
+    },
+    "parseqs": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz",
+      "integrity": "sha1-nf5wss3aw4i95PNbHyQPpYrb5sc=",
+      "dev": true,
+      "requires": {
+        "better-assert": "1.0.2"
+      }
+    },
+    "parseuri": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz",
+      "integrity": "sha1-gGWCo5iH4eoY3V4v4OAZAiaOk1A=",
+      "dev": true,
+      "requires": {
+        "better-assert": "1.0.2"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz",
+      "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY=",
+      "dev": true
+    },
+    "pascal-case": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz",
+      "integrity": "sha1-LVeNNFX2YNpl7KGO+VtODekSdh4=",
+      "dev": true,
+      "requires": {
+        "camel-case": "3.0.0",
+        "upper-case-first": "1.1.2"
+      }
+    },
+    "path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
+    "path-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz",
+      "integrity": "sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.1"
+      }
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
+      "requires": {
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "dev": true
+    },
+    "path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+      "dev": true,
+      "requires": {
+        "path-root-regex": "0.1.2"
+      }
+    },
+    "path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "pause": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz",
+      "integrity": "sha1-68ikqGGf8LioGsFRPDQ0/0af23Q=",
+      "dev": true
+    },
+    "pause-stream": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+      "dev": true,
+      "requires": {
+        "through": "2.3.8"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz",
+      "integrity": "sha1-vjZ4XFBn6kjYBv+SMojF91C2uKI=",
+      "dev": true,
+      "requires": {
+        "create-hash": "1.1.3",
+        "create-hmac": "1.1.6",
+        "ripemd160": "2.0.1",
+        "safe-buffer": "5.1.1",
+        "sha.js": "2.4.8"
+      }
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
+    "performance-now": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "2.0.4"
+      }
+    },
+    "postcss": {
+      "version": "5.2.17",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+      "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "js-base64": "2.1.9",
+        "source-map": "0.5.6",
+        "supports-color": "3.2.3"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
+      "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+      "dev": true
+    },
+    "pretty-data": {
+      "version": "0.40.0",
+      "resolved": "https://registry.npmjs.org/pretty-data/-/pretty-data-0.40.0.tgz",
+      "integrity": "sha1-Vyqo6iNGdGerlLa1Jmpv2cj93XI=",
+      "dev": true
+    },
+    "pretty-hrtime": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
+      "dev": true
+    },
+    "private": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
+      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-es6": {
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/process-es6/-/process-es6-0.11.6.tgz",
+      "integrity": "sha1-xrs4n5qVH4K9TrFpYAEFvS/5x3g=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+      "dev": true
+    },
+    "protractor": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.1.2.tgz",
+      "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=",
+      "dev": true,
+      "requires": {
+        "@types/node": "6.0.83",
+        "@types/q": "0.0.32",
+        "@types/selenium-webdriver": "2.53.42",
+        "blocking-proxy": "0.0.5",
+        "chalk": "1.1.3",
+        "glob": "7.0.6",
+        "jasmine": "2.6.0",
+        "jasminewd2": "2.1.0",
+        "optimist": "0.6.1",
+        "q": "1.4.1",
+        "saucelabs": "1.3.0",
+        "selenium-webdriver": "3.0.1",
+        "source-map-support": "0.4.15",
+        "webdriver-js-extender": "1.0.0",
+        "webdriver-manager": "12.0.6"
+      },
+      "dependencies": {
+        "@types/q": {
+          "version": "0.0.32",
+          "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
+          "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+          "dev": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+          "dev": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+          "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+          "dev": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.6.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.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.15",
+            "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.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.1.0"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "uuid": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+          "dev": true
+        },
+        "webdriver-manager": {
+          "version": "12.0.6",
+          "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.0.6.tgz",
+          "integrity": "sha1-PfGkgZdwELTL+MnYXHpXeCjA5ws=",
+          "dev": true,
+          "requires": {
+            "adm-zip": "0.4.7",
+            "chalk": "1.1.3",
+            "del": "2.2.2",
+            "glob": "7.0.6",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "q": "1.4.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "xml2js": "0.4.17"
+          }
+        }
+      }
+    },
+    "proxy-addr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz",
+      "integrity": "sha1-J+VF9pYKRKYn2bREZ+NcG2tM4vM=",
+      "dev": true,
+      "requires": {
+        "forwarded": "0.1.0",
+        "ipaddr.js": "1.3.0"
+      }
+    },
+    "proxy-middleware": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz",
+      "integrity": "sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=",
+      "dev": true
+    },
+    "prr": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
+      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "public-encrypt": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
+      "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.7",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.1.3",
+        "parse-asn1": "5.1.0",
+        "randombytes": "2.0.5"
+      }
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "q": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
+      "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
+      "dev": true
+    },
+    "qjobs": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz",
+      "integrity": "sha1-ZZ3p8s+NzCehSBJ28gU3cnI4LnM=",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+      "dev": true
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "random-bytes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
+      "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs=",
+      "dev": true
+    },
+    "randomatic": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
+      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+      "dev": true,
+      "requires": {
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "1.1.5"
+          }
+        }
+      }
+    },
+    "randombytes": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
+      "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
+      "dev": true
+    },
+    "raw-body": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+      "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
+      "dev": true,
+      "requires": {
+        "bytes": "1.0.0",
+        "string_decoder": "0.10.31"
+      },
+      "dependencies": {
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "rc": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+      "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
+      "dev": true,
+      "requires": {
+        "deep-extend": "0.4.2",
+        "ini": "1.3.4",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "1.1.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "1.1.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "requires": {
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "1.0.7",
+        "safe-buffer": "5.1.1",
+        "string_decoder": "1.0.3",
+        "util-deprecate": "1.0.2"
+      }
+    },
+    "readdirp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "readable-stream": "2.3.3",
+        "set-immediate-shim": "1.0.1"
+      }
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "requires": {
+        "resolve": "1.3.3"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "requires": {
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
+      }
+    },
+    "reflect-metadata": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz",
+      "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo="
+    },
+    "regenerate": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
+      "integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=",
+      "dev": true
+    },
+    "regenerator-runtime": {
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+      "dev": true
+    },
+    "regenerator-transform": {
+      "version": "0.9.11",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz",
+      "integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.25.0",
+        "private": "0.1.7"
+      }
+    },
+    "regex-cache": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
+      "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
+      "dev": true,
+      "requires": {
+        "is-equal-shallow": "0.1.3",
+        "is-primitive": "2.0.0"
+      }
+    },
+    "regexpu-core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+      "dev": true,
+      "requires": {
+        "regenerate": "1.3.2",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
+      }
+    },
+    "registry-auth-token": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz",
+      "integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=",
+      "dev": true,
+      "requires": {
+        "rc": "1.2.1",
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "registry-url": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
+      "dev": true,
+      "requires": {
+        "rc": "1.2.1"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "requires": {
+        "jsesc": "0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true
+    },
+    "remap-istanbul": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/remap-istanbul/-/remap-istanbul-0.6.4.tgz",
+      "integrity": "sha1-rFUe/xqmQVBLTzGNAwPdph47tpU=",
+      "dev": true,
+      "requires": {
+        "amdefine": "1.0.0",
+        "gulp-util": "3.0.7",
+        "istanbul": "0.4.3",
+        "source-map": "0.5.6",
+        "through2": "2.0.1"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
+          "dev": true
+        },
+        "amdefine": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
+          "integrity": "sha1-/RdHRwDLXMnCtwnwvp0jzjwZjDM=",
+          "dev": true
+        },
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        },
+        "fileset": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz",
+          "integrity": "sha1-WI74lzxmI7KnbfRlEFaWuWqsgGc=",
+          "dev": true,
+          "requires": {
+            "glob": "5.0.15",
+            "minimatch": "2.0.10"
+          }
+        },
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "2.0.10",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "istanbul": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.3.tgz",
+          "integrity": "sha1-W3FO4K5JOsXvIEuZ84crzu9z1To=",
+          "dev": true,
+          "requires": {
+            "abbrev": "1.0.9",
+            "async": "1.5.2",
+            "escodegen": "1.8.1",
+            "esprima": "2.7.3",
+            "fileset": "0.2.1",
+            "handlebars": "4.0.10",
+            "js-yaml": "3.9.0",
+            "mkdirp": "0.5.1",
+            "nopt": "3.0.6",
+            "once": "1.4.0",
+            "resolve": "1.1.7",
+            "supports-color": "3.2.3",
+            "which": "1.2.14",
+            "wordwrap": "1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.8"
+          }
+        },
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        },
+        "wordwrap": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+          "dev": true
+        }
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz",
+      "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=",
+      "dev": true
+    },
+    "repeat-element": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "1.0.2"
+      }
+    },
+    "replace-ext": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
+      "dev": true
+    },
+    "request": {
+      "version": "2.75.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.75.0.tgz",
+      "integrity": "sha1-0rgmiihtoT6qXQGt9dGMyQ9lfZM=",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "0.6.0",
+        "aws4": "1.6.0",
+        "bl": "1.1.2",
+        "caseless": "0.11.0",
+        "combined-stream": "1.0.5",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.0.0",
+        "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.15",
+        "node-uuid": "1.4.8",
+        "oauth-sign": "0.8.2",
+        "qs": "6.2.3",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.2",
+        "tunnel-agent": "0.4.3"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.2.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
+          "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
+          "dev": true
+        }
+      }
+    },
+    "require-dir": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/require-dir/-/require-dir-0.1.0.tgz",
+      "integrity": "sha1-geAeKZ+vW3TDS2WU+OWt1Zhd3sU=",
+      "dev": true
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "requirejs": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.3.tgz",
+      "integrity": "sha1-qln9OgKH6vQHlZoTgigES13WpqM=",
+      "dev": true
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
+      "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=",
+      "dev": true,
+      "requires": {
+        "path-parse": "1.0.5"
+      }
+    },
+    "resolve-bin": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/resolve-bin/-/resolve-bin-0.4.0.tgz",
+      "integrity": "sha1-RxMiSYkRAa+xmZH+k3ywpfBy5dk=",
+      "dev": true,
+      "requires": {
+        "find-parent-dir": "0.3.0"
+      }
+    },
+    "resolve-dir": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
+      "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "1.2.2",
+        "global-modules": "0.2.3"
+      }
+    },
+    "response-time": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz",
+      "integrity": "sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo=",
+      "dev": true,
+      "requires": {
+        "depd": "1.1.0",
+        "on-headers": "1.0.1"
+      }
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "2.0.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "dev": true,
+      "requires": {
+        "align-text": "0.1.4"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+      "dev": true,
+      "requires": {
+        "glob": "7.0.6"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
+      "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
+      "dev": true,
+      "requires": {
+        "hash-base": "2.0.2",
+        "inherits": "2.0.3"
+      }
+    },
+    "rndm": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz",
+      "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w=",
+      "dev": true
+    },
+    "rocambole": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/rocambole/-/rocambole-0.5.1.tgz",
+      "integrity": "sha1-MEj2SyOIuN2Okz+a1EPws4mrYI8=",
+      "dev": true,
+      "requires": {
+        "esprima": "2.7.3"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        }
+      }
+    },
+    "rocambole-node-remove": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rocambole-node-remove/-/rocambole-node-remove-1.0.0.tgz",
+      "integrity": "sha1-vUmxPb5hInWDdP/SR9inOeghSG8=",
+      "dev": true,
+      "requires": {
+        "rocambole-token": "1.2.1"
+      }
+    },
+    "rocambole-node-update": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rocambole-node-update/-/rocambole-node-update-1.0.1.tgz",
+      "integrity": "sha1-o//JaLDzvNnPKpM23A234lTIPFo=",
+      "dev": true,
+      "requires": {
+        "rocambole-token": "1.2.1"
+      }
+    },
+    "rocambole-strip-alert": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rocambole-strip-alert/-/rocambole-strip-alert-1.0.0.tgz",
+      "integrity": "sha1-OyVf5vGNYwH4BaFOVwsfHy26hX8=",
+      "dev": true,
+      "requires": {
+        "rocambole-node-update": "1.0.1"
+      }
+    },
+    "rocambole-strip-console": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rocambole-strip-console/-/rocambole-strip-console-1.0.0.tgz",
+      "integrity": "sha1-K5fj36bhnUUo6+galCMdyeiqygs=",
+      "dev": true,
+      "requires": {
+        "rocambole-node-update": "1.0.1"
+      }
+    },
+    "rocambole-strip-debugger": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rocambole-strip-debugger/-/rocambole-strip-debugger-1.0.0.tgz",
+      "integrity": "sha1-HFUCQgw9bvXiOnC4BUff0dS7y3Y=",
+      "dev": true,
+      "requires": {
+        "rocambole-node-remove": "1.0.0"
+      }
+    },
+    "rocambole-token": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/rocambole-token/-/rocambole-token-1.2.1.tgz",
+      "integrity": "sha1-x4XfdCjcPLJ614lwR71SOMwHDTU=",
+      "dev": true
+    },
+    "rollup": {
+      "version": "0.36.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.36.0.tgz",
+      "integrity": "sha1-37XOuy89MNk+JkCb5/NaFnfObWY=",
+      "dev": true,
+      "requires": {
+        "source-map-support": "0.4.15"
+      }
+    },
+    "rollup-plugin-commonjs": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.0.2.tgz",
+      "integrity": "sha1-mLFYm/4ypsD2d5C2DAtJmXKv7Yk=",
+      "dev": true,
+      "requires": {
+        "acorn": "4.0.13",
+        "estree-walker": "0.3.1",
+        "magic-string": "0.19.1",
+        "resolve": "1.3.3",
+        "rollup-pluginutils": "2.0.1"
+      }
+    },
+    "rollup-plugin-json": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-json/-/rollup-plugin-json-2.3.0.tgz",
+      "integrity": "sha512-W45nZH7lmXgkSR/DkeyF4ks0YWFrMysdjUT049gTuAg+lwUEDBKI2+PztqW8UDSMlXCAeEONsLzpDDyBy9m+9A==",
+      "dev": true,
+      "requires": {
+        "rollup-pluginutils": "2.0.1"
+      }
+    },
+    "rollup-plugin-multi-entry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-multi-entry/-/rollup-plugin-multi-entry-2.0.1.tgz",
+      "integrity": "sha1-Szrqjdxa/Jt/n/v7FEHATvOQcbQ=",
+      "dev": true,
+      "requires": {
+        "matched": "0.4.4"
+      }
+    },
+    "rollup-plugin-node-builtins": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-node-builtins/-/rollup-plugin-node-builtins-2.1.2.tgz",
+      "integrity": "sha1-JKH+1KQyV7a2Q3HYq8bOGrFFl+k=",
+      "dev": true,
+      "requires": {
+        "browserify-fs": "1.0.0",
+        "buffer-es6": "4.9.3",
+        "crypto-browserify": "3.11.1",
+        "process-es6": "0.11.6"
+      }
+    },
+    "rollup-plugin-node-globals": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-node-globals/-/rollup-plugin-node-globals-1.1.0.tgz",
+      "integrity": "sha1-fv2NYR0TJzeCnoBOn1H1CWKvRR8=",
+      "dev": true,
+      "requires": {
+        "acorn": "4.0.13",
+        "buffer-es6": "4.9.3",
+        "estree-walker": "0.2.1",
+        "magic-string": "0.16.0",
+        "process-es6": "0.11.6",
+        "rollup-pluginutils": "1.5.2"
+      },
+      "dependencies": {
+        "estree-walker": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz",
+          "integrity": "sha1-va/oCVOD2EFNXcLs9MkXO225QS4=",
+          "dev": true
+        },
+        "magic-string": {
+          "version": "0.16.0",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.16.0.tgz",
+          "integrity": "sha1-lw67DacZMwEoX7GqZQ85vdgetFo=",
+          "dev": true,
+          "requires": {
+            "vlq": "0.2.2"
+          }
+        },
+        "rollup-pluginutils": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz",
+          "integrity": "sha1-HhVud4+UtyVb+hs9AXi+j1xVJAg=",
+          "dev": true,
+          "requires": {
+            "estree-walker": "0.2.1",
+            "minimatch": "3.0.4"
+          }
+        }
+      }
+    },
+    "rollup-plugin-node-resolve": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz",
+      "integrity": "sha1-i4l8TDAw1QASd7BRSyXSygloPuA=",
+      "dev": true,
+      "requires": {
+        "browser-resolve": "1.11.2",
+        "builtin-modules": "1.1.1",
+        "is-module": "1.0.0",
+        "resolve": "1.3.3"
+      }
+    },
+    "rollup-plugin-uglify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-uglify/-/rollup-plugin-uglify-1.0.1.tgz",
+      "integrity": "sha1-EdCwyLzS0H5pCPdP0WsBUjkLkio=",
+      "dev": true,
+      "requires": {
+        "uglify-js": "2.8.27"
+      }
+    },
+    "rollup-pluginutils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz",
+      "integrity": "sha1-fslbNXP2VDpGpkYb2afFRFJdD8A=",
+      "dev": true,
+      "requires": {
+        "estree-walker": "0.3.1",
+        "micromatch": "2.3.11"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "2.1.0"
+      }
+    },
+    "run-sequence": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-1.2.2.tgz",
+      "integrity": "sha1-UJWgvr6YczsBQL0I3YDsAw3azes=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "gulp-util": "3.0.7"
+      }
+    },
+    "rx": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
+      "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=",
+      "dev": true
+    },
+    "rxjs": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.0.tgz",
+      "integrity": "sha1-p9sUqxV/nXqsalbmVeejhg05vyY=",
+      "requires": {
+        "symbol-observable": "1.0.4"
+      }
+    },
+    "s3": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/s3/-/s3-4.4.0.tgz",
+      "integrity": "sha1-VqT3dVFae2ucjlxrGrUfkDdmnx8=",
+      "dev": true,
+      "requires": {
+        "aws-sdk": "2.0.31",
+        "fd-slicer": "1.0.1",
+        "findit2": "2.2.3",
+        "graceful-fs": "3.0.11",
+        "mime": "1.2.11",
+        "mkdirp": "0.5.1",
+        "pend": "1.2.0",
+        "rimraf": "2.2.8",
+        "streamsink": "1.2.0"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "3.0.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
+          "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
+          "dev": true,
+          "requires": {
+            "natives": "1.1.0"
+          }
+        },
+        "mime": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "2.2.8",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
+          "dev": true
+        }
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+      "dev": true
+    },
+    "safe-json-parse": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
+      "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
+      "dev": true
+    },
+    "safe-wipe": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/safe-wipe/-/safe-wipe-0.2.4.tgz",
+      "integrity": "sha1-U7k113dbc5qSS1FslbskF/qaRR4=",
+      "dev": true,
+      "requires": {
+        "extend": "2.0.1",
+        "q": "1.4.1",
+        "rimraf": "2.6.1"
+      },
+      "dependencies": {
+        "extend": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-2.0.1.tgz",
+          "integrity": "sha1-HugBBonnOV/5RIJByYZSvHWagmA=",
+          "dev": true
+        }
+      }
+    },
+    "sass-convert": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/sass-convert/-/sass-convert-0.5.2.tgz",
+      "integrity": "sha1-se1CsOjW/pjsftbnijjiZWSGDwY=",
+      "dev": true,
+      "requires": {
+        "concat-stream": "1.6.0",
+        "dargs": "4.1.0",
+        "ends-with": "0.2.0",
+        "es6-denodeify": "0.1.5",
+        "es6-promise": "3.3.1",
+        "memoize-decorator": "1.0.2",
+        "object-assign": "3.0.0",
+        "semver": "5.3.0",
+        "semver-regex": "1.0.0",
+        "through2": "2.0.1",
+        "which": "1.2.14"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+          "dev": true
+        }
+      }
+    },
+    "sass-graph": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+      "dev": true,
+      "requires": {
+        "glob": "7.0.6",
+        "lodash": "4.17.4",
+        "scss-tokenizer": "0.2.3",
+        "yargs": "7.1.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+          "dev": true,
+          "requires": {
+            "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"
+          }
+        }
+      }
+    },
+    "sassdoc": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/sassdoc/-/sassdoc-2.2.1.tgz",
+      "integrity": "sha1-9FT0mI1e9K/Y2d3UqdCJ0F4JOEY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "chalk": "1.1.3",
+        "concat-stream": "1.6.0",
+        "docopt": "0.6.2",
+        "glob": "7.1.2",
+        "glob2base": "0.0.12",
+        "js-yaml": "3.9.0",
+        "lodash.difference": "4.5.0",
+        "lodash.uniq": "4.5.0",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "multipipe": "1.0.2",
+        "rimraf": "2.6.1",
+        "safe-wipe": "0.2.4",
+        "sass-convert": "0.5.2",
+        "sassdoc-theme-default": "2.6.1",
+        "scss-comment-parser": "0.8.3",
+        "strip-indent": "2.0.0",
+        "through2": "1.1.1",
+        "update-notifier": "2.2.0",
+        "vinyl-fs": "2.4.4",
+        "vinyl-source-stream": "1.1.0"
+      },
+      "dependencies": {
+        "duplexer2": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+          "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2.3.3"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "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-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "3.1.0",
+            "path-dirname": "1.0.2"
+          }
+        },
+        "glob-stream": {
+          "version": "5.3.5",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
+          "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
+          "dev": true,
+          "requires": {
+            "extend": "3.0.1",
+            "glob": "5.0.15",
+            "glob-parent": "3.1.0",
+            "micromatch": "2.3.11",
+            "ordered-read-streams": "0.3.0",
+            "through2": "0.6.5",
+            "to-absolute-glob": "0.1.1",
+            "unique-stream": "2.2.1"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "5.0.15",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+              "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+              "dev": true,
+              "requires": {
+                "inflight": "1.0.6",
+                "inherits": "2.0.3",
+                "minimatch": "3.0.4",
+                "once": "1.4.0",
+                "path-is-absolute": "1.0.1"
+              }
+            },
+            "readable-stream": {
+              "version": "1.0.34",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+              "dev": true,
+              "requires": {
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "0.0.1",
+                "string_decoder": "0.10.31"
+              }
+            },
+            "through2": {
+              "version": "0.6.5",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+              "dev": true,
+              "requires": {
+                "readable-stream": "1.0.34",
+                "xtend": "4.0.1"
+              }
+            }
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "multipipe": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-1.0.2.tgz",
+          "integrity": "sha1-zBPv2DPJzamfIk+GhGG44aP9k50=",
+          "dev": true,
+          "requires": {
+            "duplexer2": "0.1.4",
+            "object-assign": "4.1.1"
+          }
+        },
+        "ordered-read-streams": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
+          "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
+          "dev": true,
+          "requires": {
+            "is-stream": "1.1.0",
+            "readable-stream": "2.3.3"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "through2": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+          "integrity": "sha1-CEfLxESfNAVXTb3M2buEG4OsNUU=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.1.14",
+            "xtend": "4.0.1"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.1.14",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+              "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+              "dev": true,
+              "requires": {
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "0.0.1",
+                "string_decoder": "0.10.31"
+              }
+            }
+          }
+        },
+        "unique-stream": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
+          "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
+          "dev": true,
+          "requires": {
+            "json-stable-stringify": "1.0.1",
+            "through2-filter": "2.0.0"
+          }
+        },
+        "vinyl-fs": {
+          "version": "2.4.4",
+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
+          "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
+          "dev": true,
+          "requires": {
+            "duplexify": "3.5.0",
+            "glob-stream": "5.3.5",
+            "graceful-fs": "4.1.11",
+            "gulp-sourcemaps": "1.6.0",
+            "is-valid-glob": "0.3.0",
+            "lazystream": "1.0.0",
+            "lodash.isequal": "4.5.0",
+            "merge-stream": "1.0.1",
+            "mkdirp": "0.5.1",
+            "object-assign": "4.1.1",
+            "readable-stream": "2.3.3",
+            "strip-bom": "2.0.0",
+            "strip-bom-stream": "1.0.0",
+            "through2": "2.0.3",
+            "through2-filter": "2.0.0",
+            "vali-date": "1.0.0",
+            "vinyl": "1.2.0"
+          },
+          "dependencies": {
+            "through2": {
+              "version": "2.0.3",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+              "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+              "dev": true,
+              "requires": {
+                "readable-stream": "2.3.3",
+                "xtend": "4.0.1"
+              }
+            }
+          }
+        }
+      }
+    },
+    "sassdoc-extras": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/sassdoc-extras/-/sassdoc-extras-2.4.1.tgz",
+      "integrity": "sha1-1px4MUKo/kJ8crsy/NZS8doD+Ao=",
+      "dev": true,
+      "requires": {
+        "marked": "0.3.6"
+      }
+    },
+    "sassdoc-theme-default": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/sassdoc-theme-default/-/sassdoc-theme-default-2.6.1.tgz",
+      "integrity": "sha1-bUhZZloVqKli/oBj5nWnyGESpgg=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "chroma-js": "1.3.4",
+        "es6-denodeify": "0.1.5",
+        "es6-promise": "4.1.1",
+        "extend": "3.0.1",
+        "fs-extra": "2.1.2",
+        "html-minifier": "3.5.2",
+        "sassdoc-extras": "2.4.1",
+        "swig": "1.4.0",
+        "swig-extras": "0.0.1"
+      },
+      "dependencies": {
+        "es6-promise": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz",
+          "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==",
+          "dev": true
+        }
+      }
+    },
+    "saucelabs": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.3.0.tgz",
+      "integrity": "sha1-0kDoAJ33+ocwbsRXimm6O1xCT+4=",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "1.0.0"
+      }
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "scss-comment-parser": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/scss-comment-parser/-/scss-comment-parser-0.8.3.tgz",
+      "integrity": "sha512-qc0uF3R1QKfJAUN+9nh3CA0Wex6JkW+lcxMLxR/RYhzoeBmjTRhjhaLGf50O3OeBxhLcwbVtDr7/X0cFWysGbA==",
+      "dev": true,
+      "requires": {
+        "cdocparser": "0.13.0"
+      }
+    },
+    "scss-tokenizer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+      "dev": true,
+      "requires": {
+        "js-base64": "2.1.9",
+        "source-map": "0.4.4"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "selenium-webdriver": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz",
+      "integrity": "sha1-ot6l2kqX9mcuiefKcnbO+jZRR6c=",
+      "dev": true,
+      "requires": {
+        "adm-zip": "0.4.7",
+        "rimraf": "2.6.1",
+        "tmp": "0.0.30",
+        "xml2js": "0.4.17"
+      }
+    },
+    "semver": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+      "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+      "dev": true
+    },
+    "semver-diff": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
+      "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
+      "dev": true,
+      "requires": {
+        "semver": "5.3.0"
+      }
+    },
+    "semver-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz",
+      "integrity": "sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk=",
+      "dev": true
+    },
+    "send": {
+      "version": "0.15.3",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.15.3.tgz",
+      "integrity": "sha1-UBP5+ZAj31DRvZiSwZ4979HVMwk=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.7",
+        "depd": "1.1.0",
+        "destroy": "1.0.4",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "etag": "1.8.0",
+        "fresh": "0.5.0",
+        "http-errors": "1.6.1",
+        "mime": "1.3.4",
+        "ms": "2.0.0",
+        "on-finished": "2.3.0",
+        "range-parser": "1.2.0",
+        "statuses": "1.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
+          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "sentence-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz",
+      "integrity": "sha1-H24t2jnBaL+S0T+G1KkYkz9mftQ=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.1",
+        "upper-case-first": "1.1.2"
+      }
+    },
+    "sequencify": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
+      "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
+      "dev": true
+    },
+    "serve-favicon": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz",
+      "integrity": "sha1-3UGeJo3gEqtysxnTN/IQUBP5OB8=",
+      "dev": true,
+      "requires": {
+        "etag": "1.7.0",
+        "fresh": "0.3.0",
+        "ms": "0.7.2",
+        "parseurl": "1.3.1"
+      },
+      "dependencies": {
+        "etag": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz",
+          "integrity": "sha1-A9MLX2fdbmMtKUXTDWZScxo01dg=",
+          "dev": true
+        },
+        "fresh": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz",
+          "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "serve-index": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz",
+      "integrity": "sha1-egV/xu4o3GP2RWbl+lexEahq7NI=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.2.13",
+        "batch": "0.5.3",
+        "debug": "2.2.0",
+        "escape-html": "1.0.3",
+        "http-errors": "1.3.1",
+        "mime-types": "2.1.15",
+        "parseurl": "1.3.1"
+      },
+      "dependencies": {
+        "accepts": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz",
+          "integrity": "sha1-5fHzkoxtlf2WVYw27D2dDeSm7Oo=",
+          "dev": true,
+          "requires": {
+            "mime-types": "2.1.15",
+            "negotiator": "0.5.3"
+          }
+        },
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "http-errors": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz",
+          "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "statuses": "1.3.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        },
+        "negotiator": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz",
+          "integrity": "sha1-Jp1cR2gQ7JLtvntsLygxY4T5p+g=",
+          "dev": true
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz",
+      "integrity": "sha1-1sznaTUF9zPHWd5Xvvwa92wPCAU=",
+      "dev": true,
+      "requires": {
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "parseurl": "1.3.1",
+        "send": "0.14.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "etag": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz",
+          "integrity": "sha1-A9MLX2fdbmMtKUXTDWZScxo01dg=",
+          "dev": true
+        },
+        "fresh": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz",
+          "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=",
+          "dev": true
+        },
+        "http-errors": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz",
+          "integrity": "sha1-eIwNLB3iyBuebowBhDtrl+uSB1A=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "setprototypeof": "1.0.2",
+            "statuses": "1.3.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        },
+        "send": {
+          "version": "0.14.1",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.14.1.tgz",
+          "integrity": "sha1-qVSYQyU5L1FTKndgdg5FlZjIn3o=",
+          "dev": true,
+          "requires": {
+            "debug": "2.2.0",
+            "depd": "1.1.0",
+            "destroy": "1.0.4",
+            "encodeurl": "1.0.1",
+            "escape-html": "1.0.3",
+            "etag": "1.7.0",
+            "fresh": "0.3.0",
+            "http-errors": "1.5.1",
+            "mime": "1.3.4",
+            "ms": "0.7.1",
+            "on-finished": "2.3.0",
+            "range-parser": "1.2.0",
+            "statuses": "1.3.1"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz",
+          "integrity": "sha1-gaVSFB7BBLiOic44MQOtXGZWTQg=",
+          "dev": true
+        }
+      }
+    },
+    "serviceworker-cache-polyfill": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz",
+      "integrity": "sha1-3hnuc77yGrPAdAo3sz22JGS6ves=",
+      "dev": true
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-getter": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz",
+      "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=",
+      "dev": true,
+      "requires": {
+        "to-object-path": "0.3.0"
+      }
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+      "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz",
+      "integrity": "sha1-NwaMLEdra69ALRSknGf1l5IfY08=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "shell-escape": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/shell-escape/-/shell-escape-0.2.0.tgz",
+      "integrity": "sha1-aP0CXrBJC09WegJ/C/IkgLX4QTM=",
+      "dev": true
+    },
+    "shelljs": {
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
+      "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
+      "dev": true,
+      "requires": {
+        "glob": "7.0.6",
+        "interpret": "1.0.3",
+        "rechoir": "0.6.2"
+      }
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "slide": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
+      "dev": true
+    },
+    "snake-case": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz",
+      "integrity": "sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.1"
+      }
+    },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "dev": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "socket.io": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz",
+      "integrity": "sha1-krf3y4jFeX1NruJ5/oB12+bT+hw=",
+      "dev": true,
+      "requires": {
+        "debug": "2.2.0",
+        "engine.io": "1.6.10",
+        "has-binary": "0.1.7",
+        "socket.io-adapter": "0.4.0",
+        "socket.io-client": "1.4.6",
+        "socket.io-parser": "2.2.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-adapter": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz",
+      "integrity": "sha1-+5+CqxqmUpC/csNleVW5MKmRok8=",
+      "dev": true,
+      "requires": {
+        "debug": "2.2.0",
+        "socket.io-parser": "2.2.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        },
+        "socket.io-parser": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz",
+          "integrity": "sha1-PXr2tkSX6Va32f53X5mXFgJ/lBc=",
+          "dev": true,
+          "requires": {
+            "benchmark": "1.0.0",
+            "component-emitter": "1.1.2",
+            "debug": "0.7.4",
+            "isarray": "0.0.1",
+            "json3": "3.2.6"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "0.7.4",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
+              "integrity": "sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "socket.io-client": {
+      "version": "1.4.6",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz",
+      "integrity": "sha1-SbC6U379FbgpfIQBbmQuHHx1LD0=",
+      "dev": true,
+      "requires": {
+        "backo2": "1.0.2",
+        "component-bind": "1.0.0",
+        "component-emitter": "1.2.0",
+        "debug": "2.2.0",
+        "engine.io-client": "1.6.9",
+        "has-binary": "0.1.7",
+        "indexof": "0.0.1",
+        "object-component": "0.0.3",
+        "parseuri": "0.0.4",
+        "socket.io-parser": "2.2.6",
+        "to-array": "0.1.4"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz",
+          "integrity": "sha1-zNETqGOI0GSC0D3j/H35hSa6jv4=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz",
+      "integrity": "sha1-ON/WHfUNz4qx2eIJEyK/kCuii5k=",
+      "dev": true,
+      "requires": {
+        "benchmark": "1.0.0",
+        "component-emitter": "1.1.2",
+        "debug": "2.2.0",
+        "isarray": "0.0.1",
+        "json3": "3.3.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "json3": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+          "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "source-list-map": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz",
+      "integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE=",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+    },
+    "source-map-support": {
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
+      "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=",
+      "requires": {
+        "source-map": "0.5.6"
+      }
+    },
+    "sparkles": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
+      "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
+      "dev": true,
+      "requires": {
+        "spdx-license-ids": "1.2.2"
+      }
+    },
+    "spdx-expression-parse": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
+      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
+      "dev": true
+    },
+    "spdx-license-ids": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
+      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
+      "dev": true
+    },
+    "spdx-license-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-2.1.0.tgz",
+      "integrity": "sha1-N4j/tcgLJK++goOTTp5mhOpqIY0=",
+      "dev": true
+    },
+    "split": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/split/-/split-1.0.0.tgz",
+      "integrity": "sha1-xDlc5oOrzSVLwo/h2rtuXCfc/64=",
+      "dev": true,
+      "requires": {
+        "through": "2.3.8"
+      }
+    },
+    "split2": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz",
+      "integrity": "sha1-eh9VHhdqkOzTNF9yRqDP4XXvT9A=",
+      "dev": true,
+      "requires": {
+        "through2": "2.0.3"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2.3.3",
+            "xtend": "4.0.1"
+          }
+        }
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "dev": true,
+      "requires": {
+        "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": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true
+    },
+    "statuses": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+      "dev": true
+    },
+    "stdout-stream": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
+      "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+      "dev": true,
+      "requires": {
+        "duplexer": "0.1.1"
+      }
+    },
+    "stream-consume": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
+      "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=",
+      "dev": true
+    },
+    "stream-counter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz",
+      "integrity": "sha1-3tJmVWMZyLDiIoErnPOyb6fZR94=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "1.1.14"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "stream-http": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
+      "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "3.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "to-arraybuffer": "1.0.1",
+        "xtend": "4.0.1"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
+    "streamsink": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/streamsink/-/streamsink-1.2.0.tgz",
+      "integrity": "sha1-76/unx4i01ke1949yqlcP1559zw=",
+      "dev": true
+    },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "string-range": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz",
+      "integrity": "sha1-qJPtNH5yKZvIO++78qaSqNI51d0=",
+      "dev": true
+    },
+    "string-template": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
+      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "requires": {
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "stringmap": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz",
+      "integrity": "sha1-VWwTeyWPlCuHdvWy71gqoGnX0bE=",
+      "dev": true
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "0.2.1"
+      }
+    },
+    "strip-bom-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
+      "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
+      "dev": true,
+      "requires": {
+        "first-chunk-stream": "1.0.0",
+        "strip-bom": "2.0.0"
+      }
+    },
+    "strip-debug": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/strip-debug/-/strip-debug-1.1.1.tgz",
+      "integrity": "sha1-aYJBmGdp3O9RPcbHymKbBryfIXs=",
+      "dev": true,
+      "requires": {
+        "rocambole": "0.5.1",
+        "rocambole-strip-alert": "1.0.0",
+        "rocambole-strip-console": "1.0.0",
+        "rocambole-strip-debugger": "1.0.0"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-function": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/strip-function/-/strip-function-0.0.3.tgz",
+      "integrity": "sha1-xHp+PJ+o4MauXdhgINr9mGIDVN0=",
+      "dev": true,
+      "requires": {
+        "tslint": "3.15.1",
+        "tslint-eslint-rules": "1.5.0",
+        "typescript": "2.3.4"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz",
+          "integrity": "sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k=",
+          "dev": true
+        },
+        "tslint": {
+          "version": "3.15.1",
+          "resolved": "https://registry.npmjs.org/tslint/-/tslint-3.15.1.tgz",
+          "integrity": "sha1-2hZcqT2P3CwIa1EWXuG6y0jJjqU=",
+          "dev": true,
+          "requires": {
+            "colors": "1.1.2",
+            "diff": "2.2.3",
+            "findup-sync": "0.3.0",
+            "glob": "7.0.6",
+            "optimist": "0.6.1",
+            "resolve": "1.3.3",
+            "underscore.string": "3.3.4"
+          }
+        },
+        "tslint-eslint-rules": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-1.5.0.tgz",
+          "integrity": "sha1-iyRPsDuuDyGeJ4NX3cqv7oHBlhU=",
+          "dev": true,
+          "requires": {
+            "doctrine": "0.7.2",
+            "tslint": "3.15.1"
+          }
+        }
+      }
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "4.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz",
+      "integrity": "sha512-Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg==",
+      "dev": true,
+      "requires": {
+        "has-flag": "2.0.0"
+      }
+    },
+    "sw-toolbox": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/sw-toolbox/-/sw-toolbox-3.4.0.tgz",
+      "integrity": "sha1-oW7+z0p57TIZHPGSNSXy7om8dtw=",
+      "dev": true,
+      "requires": {
+        "path-to-regexp": "1.7.0",
+        "serviceworker-cache-polyfill": "4.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "path-to-regexp": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
+          "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+          "dev": true,
+          "requires": {
+            "isarray": "0.0.1"
+          }
+        }
+      }
+    },
+    "swap-case": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz",
+      "integrity": "sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=",
+      "dev": true,
+      "requires": {
+        "lower-case": "1.1.4",
+        "upper-case": "1.1.3"
+      }
+    },
+    "swig": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/swig/-/swig-1.4.0.tgz",
+      "integrity": "sha1-4OYGoImfiGp67npF0bOYwrJdJdE=",
+      "dev": true,
+      "requires": {
+        "optimist": "0.6.1",
+        "uglify-js": "2.4.24"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.2.10",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+          "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.1.34",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+          "integrity": "sha1-p8/omux7FoLDsZjQrPtH19CQVms=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        },
+        "uglify-js": {
+          "version": "2.4.24",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz",
+          "integrity": "sha1-+tV1XB4Vd2WLsG/5q25UjJW+vW4=",
+          "dev": true,
+          "requires": {
+            "async": "0.2.10",
+            "source-map": "0.1.34",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.5.4"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "3.5.4",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+          "integrity": "sha1-2K/49mXpTDS9JZvevRv68N3TU2E=",
+          "dev": true,
+          "requires": {
+            "camelcase": "1.2.1",
+            "decamelize": "1.2.0",
+            "window-size": "0.1.0",
+            "wordwrap": "0.0.2"
+          }
+        }
+      }
+    },
+    "swig-extras": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/swig-extras/-/swig-extras-0.0.1.tgz",
+      "integrity": "sha1-tQP+3jcqucJMasaMr2VrzvGHIyg=",
+      "dev": true,
+      "requires": {
+        "markdown": "0.5.0"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
+      "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
+    },
+    "sync-exec": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/sync-exec/-/sync-exec-0.6.2.tgz",
+      "integrity": "sha1-cX0izFPwzh3vVZQ2LzqJouu5EQU=",
+      "dev": true
+    },
+    "systemjs": {
+      "version": "0.19.38",
+      "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.19.38.tgz",
+      "integrity": "sha1-5S4k1QLSufC1bXfFft5n0JFrxMU=",
+      "dev": true,
+      "requires": {
+        "when": "3.7.8"
+      }
+    },
+    "tapable": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz",
+      "integrity": "sha1-IGvo4YiGC1FEJTdebxrom/sB/Y0=",
+      "dev": true
+    },
+    "tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "dev": true,
+      "requires": {
+        "block-stream": "0.0.9",
+        "fstream": "1.0.11",
+        "inherits": "2.0.3"
+      }
+    },
+    "term-size": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
+      "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
+      "dev": true,
+      "requires": {
+        "execa": "0.7.0"
+      }
+    },
+    "ternary-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-2.0.1.tgz",
+      "integrity": "sha1-Bk5Im0tb9gumpre8fy9cJ07Pgmk=",
+      "dev": true,
+      "requires": {
+        "duplexify": "3.5.0",
+        "fork-stream": "0.0.4",
+        "merge-stream": "1.0.1",
+        "through2": "2.0.1"
+      }
+    },
+    "text-extensions": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.5.0.tgz",
+      "integrity": "sha1-0cstFLXQvEW/3Kigikc/aMfrDLw=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
+      "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.0.6",
+        "xtend": "4.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "0.10.31",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "through2-filter": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
+      "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
+      "dev": true,
+      "requires": {
+        "through2": "2.0.1",
+        "xtend": "4.0.1"
+      }
+    },
+    "tildify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
+      "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2"
+      }
+    },
+    "time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+      "dev": true
+    },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+      "dev": true
+    },
+    "timers-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz",
+      "integrity": "sha1-q0iDz1l9zVCvIRNJoA+8pWrIa4Y=",
+      "dev": true,
+      "requires": {
+        "setimmediate": "1.0.5"
+      }
+    },
+    "tiny-lr": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.0.4.tgz",
+      "integrity": "sha1-0Tvs83+LfpYzIPV0Mpjj6TTHMpo=",
+      "dev": true,
+      "requires": {
+        "body": "5.1.0",
+        "debug": "2.2.0",
+        "faye-websocket": "0.10.0",
+        "livereload-js": "2.2.2",
+        "object-assign": "4.1.1",
+        "qs": "6.4.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "title-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz",
+      "integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.1",
+        "upper-case": "1.1.3"
+      }
+    },
+    "tmp": {
+      "version": "0.0.30",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz",
+      "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "to-absolute-glob": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
+      "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "2.0.1"
+      }
+    },
+    "to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
+      "dev": true
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "tough-cookie": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
+    },
+    "trim-off-newlines": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz",
+      "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=",
+      "dev": true
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "ts-node": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-1.3.0.tgz",
+      "integrity": "sha1-CmiqCAC333oritbn40sPlhI4elI=",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "chalk": "1.1.3",
+        "diff": "2.2.3",
+        "make-error": "1.3.0",
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "pinkie": "2.0.4",
+        "source-map-support": "0.4.15",
+        "tsconfig": "5.0.3",
+        "xtend": "4.0.1"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz",
+          "integrity": "sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k=",
+          "dev": true
+        }
+      }
+    },
+    "tsconfig": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-5.0.3.tgz",
+      "integrity": "sha1-X0J45wGACWeo/Dg/0ZZIh48qbjo=",
+      "dev": true,
+      "requires": {
+        "any-promise": "1.3.0",
+        "parse-json": "2.2.0",
+        "strip-bom": "2.0.0",
+        "strip-json-comments": "2.0.1"
+      }
+    },
+    "tsickle": {
+      "version": "0.21.6",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.6.tgz",
+      "integrity": "sha1-U7Abl5xcE/2xOvs/uVgXflmRWI0=",
+      "requires": {
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "source-map": "0.5.6",
+        "source-map-support": "0.4.15"
+      }
+    },
+    "tslib": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz",
+      "integrity": "sha1-vIAEFkaRkjp5/oN4u+s9ogF1OOw=",
+      "dev": true
+    },
+    "tslint": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.5.0.tgz",
+      "integrity": "sha1-EOjas+MGH6YelELozuOYKs8gpqo=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.22.0",
+        "colors": "1.1.2",
+        "commander": "2.11.0",
+        "diff": "3.3.0",
+        "glob": "7.1.2",
+        "minimatch": "3.0.4",
+        "resolve": "1.3.3",
+        "semver": "5.3.0",
+        "tslib": "1.7.1",
+        "tsutils": "2.6.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "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"
+          }
+        },
+        "tsutils": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.6.1.tgz",
+          "integrity": "sha1-mOzwCVlPTkr4hAV75M9BpFC8djc=",
+          "dev": true,
+          "requires": {
+            "tslib": "1.7.1"
+          }
+        }
+      }
+    },
+    "tslint-eslint-rules": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz",
+      "integrity": "sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=",
+      "dev": true,
+      "requires": {
+        "doctrine": "0.7.2",
+        "tslib": "1.7.1",
+        "tsutils": "1.9.1"
+      }
+    },
+    "tslint-ionic-rules": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/tslint-ionic-rules/-/tslint-ionic-rules-0.0.11.tgz",
+      "integrity": "sha512-EP4/Vgv0Zl66T8dqZe6LV3g+aWpGCSBxHKfScbiFh3kQKE3cikGEEYCLu1vR5yhjvm5DveWFUobwEFiwlts0hw==",
+      "dev": true,
+      "requires": {
+        "tslint-eslint-rules": "4.1.1"
+      }
+    },
+    "tsscmp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz",
+      "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc=",
+      "dev": true
+    },
+    "tsutils": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
+      "integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
+      "dev": true
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+      "dev": true
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true,
+      "optional": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2"
+      }
+    },
+    "type-is": {
+      "version": "1.6.15",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
+      "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "2.1.15"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "typedarray-to-buffer": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-1.0.4.tgz",
+      "integrity": "sha1-m7i6DoQfs/TPH+fCRenz+opf6Zw=",
+      "dev": true
+    },
+    "typescript": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz",
+      "integrity": "sha1-PTgyGCgjHkNPKHUUlZw3qCtin0I=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "2.8.27",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.27.tgz",
+      "integrity": "sha1-R3h/kSsPJC5bmENDvo416V9pTJw=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.6",
+        "uglify-to-browserify": "1.0.2",
+        "yargs": "3.10.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "requires": {
+            "center-align": "0.1.3",
+            "right-align": "0.1.3",
+            "wordwrap": "0.0.2"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "requires": {
+            "camelcase": "1.2.1",
+            "cliui": "2.1.0",
+            "decamelize": "1.2.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
+    },
+    "uglify-save-license": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/uglify-save-license/-/uglify-save-license-0.4.1.tgz",
+      "integrity": "sha1-lXJsF8xv0XHDYX479NjYKqjEzOE=",
+      "dev": true
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "dev": true
+    },
+    "uid-safe": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz",
+      "integrity": "sha1-Otbzg2jG1MjHXsF2I/t5qh0HHYE=",
+      "dev": true,
+      "requires": {
+        "random-bytes": "1.0.0"
+      }
+    },
+    "ultron": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
+      "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=",
+      "dev": true
+    },
+    "unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+      "dev": true
+    },
+    "underscore": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+      "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
+      "dev": true
+    },
+    "underscore-contrib": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
+      "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=",
+      "dev": true,
+      "requires": {
+        "underscore": "1.6.0"
+      }
+    },
+    "underscore.string": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
+      "integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "1.0.3",
+        "util-deprecate": "1.0.2"
+      }
+    },
+    "unique-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
+      "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=",
+      "dev": true
+    },
+    "unique-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+      "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+      "dev": true,
+      "requires": {
+        "crypto-random-string": "1.0.0"
+      }
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "unzip-response": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+      "dev": true
+    },
+    "update-notifier": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz",
+      "integrity": "sha1-G1g3z5DAc22IYncytmHBOPht5y8=",
+      "dev": true,
+      "requires": {
+        "boxen": "1.2.0",
+        "chalk": "1.1.3",
+        "configstore": "3.1.0",
+        "import-lazy": "2.1.0",
+        "is-npm": "1.0.0",
+        "latest-version": "3.1.0",
+        "semver-diff": "2.1.0",
+        "xdg-basedir": "3.0.0"
+      }
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "upper-case-first": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz",
+      "integrity": "sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=",
+      "dev": true,
+      "requires": {
+        "upper-case": "1.1.3"
+      }
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "1.0.4"
+      }
+    },
+    "user-home": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
+      "dev": true
+    },
+    "useragent": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz",
+      "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "2.2.4",
+        "tmp": "0.0.30"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
+          "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
+          "dev": true
+        }
+      }
+    },
+    "utf8": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz",
+      "integrity": "sha1-DP7FyAUtRKI+OqqQgQToB1+V39U=",
+      "dev": true
+    },
+    "util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.1"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+      "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=",
+      "dev": true
+    },
+    "v8flags": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
+      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
+      "dev": true,
+      "requires": {
+        "user-home": "1.1.1"
+      }
+    },
+    "vali-date": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
+      "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
+      "dev": true
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "1.0.2",
+        "spdx-expression-parse": "1.0.4"
+      }
+    },
+    "validate.js": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/validate.js/-/validate.js-0.9.0.tgz",
+      "integrity": "sha1-is8BRPFSChmDXGzGY/ReCDaqVsg=",
+      "dev": true
+    },
+    "vary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz",
+      "integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc=",
+      "dev": true
+    },
+    "verror": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
+      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
+      "dev": true,
+      "requires": {
+        "extsprintf": "1.0.2"
+      }
+    },
+    "vhost": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz",
+      "integrity": "sha1-L7HezUxGaqiLD5NBrzPcGv8keNU=",
+      "dev": true
+    },
+    "vinyl": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
+      "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
+      "dev": true,
+      "requires": {
+        "clone": "1.0.2",
+        "clone-stats": "0.0.1",
+        "replace-ext": "0.0.1"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+          "dev": true
+        }
+      }
+    },
+    "vinyl-bufferstream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz",
+      "integrity": "sha1-BTeGn1gO/6TKRay0dXnkuf5jCBo=",
+      "dev": true,
+      "requires": {
+        "bufferstreams": "1.0.1"
+      }
+    },
+    "vinyl-file": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/vinyl-file/-/vinyl-file-1.3.0.tgz",
+      "integrity": "sha1-qgVjTTqGe6kUR77bs0r8sm9E9uc=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "strip-bom": "2.0.0",
+        "strip-bom-stream": "1.0.0",
+        "vinyl": "1.2.0"
+      }
+    },
+    "vinyl-fs": {
+      "version": "0.3.14",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
+      "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
+      "dev": true,
+      "requires": {
+        "defaults": "1.0.3",
+        "glob-stream": "3.1.18",
+        "glob-watcher": "0.0.6",
+        "graceful-fs": "3.0.11",
+        "mkdirp": "0.5.1",
+        "strip-bom": "1.0.0",
+        "through2": "0.6.5",
+        "vinyl": "0.4.6"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
+          "dev": true
+        },
+        "graceful-fs": {
+          "version": "3.0.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
+          "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
+          "dev": true,
+          "requires": {
+            "natives": "1.1.0"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "strip-bom": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
+          "dev": true,
+          "requires": {
+            "first-chunk-stream": "1.0.0",
+            "is-utf8": "0.2.1"
+          }
+        },
+        "through2": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34",
+            "xtend": "4.0.1"
+          }
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+          "dev": true,
+          "requires": {
+            "clone": "0.2.0",
+            "clone-stats": "0.0.1"
+          }
+        }
+      }
+    },
+    "vinyl-source-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl-source-stream/-/vinyl-source-stream-1.1.0.tgz",
+      "integrity": "sha1-RMvlEIIFJ53rDFZTwJSiiHk4sas=",
+      "dev": true,
+      "requires": {
+        "through2": "0.6.5",
+        "vinyl": "0.4.6"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
+          "dev": true
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "through2": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34",
+            "xtend": "4.0.1"
+          }
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+          "dev": true,
+          "requires": {
+            "clone": "0.2.0",
+            "clone-stats": "0.0.1"
+          }
+        }
+      }
+    },
+    "vinyl-sourcemaps-apply": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
+      "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.6"
+      }
+    },
+    "vlq": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.2.tgz",
+      "integrity": "sha1-4xbVJXtAuGu0PLjV/qXX9U1rDKE=",
+      "dev": true
+    },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
+    "void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+      "dev": true
+    },
+    "walkdir": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz",
+      "integrity": "sha1-oW0CXrkxvQO1LzCMrtD0D86+lTI=",
+      "dev": true
+    },
+    "watchpack": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz",
+      "integrity": "sha1-fYaTkHsozmAT5/NhCqKhrPB9rYc=",
+      "dev": true,
+      "requires": {
+        "async": "2.5.0",
+        "chokidar": "1.7.0",
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "webdriver-js-extender": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz",
+      "integrity": "sha1-gcUzqeM9W/tZe05j4s2yW1R3dRU=",
+      "dev": true,
+      "requires": {
+        "@types/selenium-webdriver": "2.53.42",
+        "selenium-webdriver": "2.53.3"
+      },
+      "dependencies": {
+        "adm-zip": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz",
+          "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY=",
+          "dev": true
+        },
+        "sax": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
+          "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=",
+          "dev": true
+        },
+        "selenium-webdriver": {
+          "version": "2.53.3",
+          "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz",
+          "integrity": "sha1-0p/1qVff8aG0ncRXdW5OS/vc4IU=",
+          "dev": true,
+          "requires": {
+            "adm-zip": "0.4.4",
+            "rimraf": "2.6.1",
+            "tmp": "0.0.24",
+            "ws": "1.1.1",
+            "xml2js": "0.4.4"
+          }
+        },
+        "tmp": {
+          "version": "0.0.24",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz",
+          "integrity": "sha1-1qXhmNFKmDXMby18PZ4wJCjIzxI=",
+          "dev": true
+        },
+        "xml2js": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+          "integrity": "sha1-MREBAAMAiuGSQOuhdJe1fHKcVV0=",
+          "dev": true,
+          "requires": {
+            "sax": "0.6.1",
+            "xmlbuilder": "4.2.1"
+          }
+        }
+      }
+    },
+    "webpack": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.7.0.tgz",
+      "integrity": "sha512-MjAA0ZqO1ba7ZQJRnoCdbM56mmFpipOPUv/vQpwwfSI42p5PVDdoiuK2AL2FwFUVgT859Jr43bFZXRg/LNsqvg==",
+      "dev": true,
+      "requires": {
+        "acorn": "5.1.1",
+        "acorn-dynamic-import": "2.0.2",
+        "ajv": "4.11.8",
+        "ajv-keywords": "1.5.1",
+        "async": "2.5.0",
+        "enhanced-resolve": "3.3.0",
+        "interpret": "1.0.3",
+        "json-loader": "0.5.4",
+        "json5": "0.5.1",
+        "loader-runner": "2.3.0",
+        "loader-utils": "0.2.17",
+        "memory-fs": "0.4.1",
+        "mkdirp": "0.5.1",
+        "node-libs-browser": "2.0.0",
+        "source-map": "0.5.6",
+        "supports-color": "3.2.3",
+        "tapable": "0.2.6",
+        "uglify-js": "2.8.27",
+        "watchpack": "1.3.1",
+        "webpack-sources": "1.0.1",
+        "yargs": "6.6.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz",
+          "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "source-list-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
+          "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        },
+        "webpack-sources": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
+          "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "2.0.0",
+            "source-map": "0.5.6"
+          }
+        },
+        "yargs": {
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
+          "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
+          "dev": true,
+          "requires": {
+            "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": "4.2.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
+          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+          "dev": true,
+          "requires": {
+            "camelcase": "3.0.0"
+          }
+        }
+      }
+    },
+    "webpack-sources": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz",
+      "integrity": "sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=",
+      "dev": true,
+      "requires": {
+        "source-list-map": "1.1.2",
+        "source-map": "0.5.6"
+      }
+    },
+    "websocket-driver": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+      "dev": true,
+      "requires": {
+        "websocket-extensions": "0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
+      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
+      "dev": true
+    },
+    "when": {
+      "version": "3.7.8",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
+      "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=",
+      "dev": true
+    },
+    "which": {
+      "version": "1.2.14",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
+      "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
+      "dev": true,
+      "requires": {
+        "isexe": "2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "wide-align": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2"
+      }
+    },
+    "widest-line": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
+      "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2"
+      }
+    },
+    "win-release": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
+      "integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
+      "dev": true,
+      "requires": {
+        "semver": "5.3.0"
+      }
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+      "dev": true
+    },
+    "winston": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz",
+      "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=",
+      "dev": true,
+      "requires": {
+        "async": "1.0.0",
+        "colors": "1.0.3",
+        "cycle": "1.0.3",
+        "eyes": "0.1.8",
+        "isstream": "0.1.2",
+        "stack-trace": "0.0.10"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
+          "dev": true
+        },
+        "colors": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+          "dev": true
+        }
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write-file-atomic": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz",
+      "integrity": "sha512-0TZ20a+xcIl4u0+Mj5xDH2yOWdmQiXlKf9Hm+TgDXjTMsEYb+gDrmb8e8UNAzMCitX8NBqG4Z/FUQIyzv/R1JQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "imurmurhash": "0.1.4",
+        "slide": "1.1.6"
+      }
+    },
+    "ws": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz",
+      "integrity": "sha1-CC3bbGQehdS7RR8D1S8G6r2x8Bg=",
+      "dev": true,
+      "requires": {
+        "options": "0.0.6",
+        "ultron": "1.0.2"
+      }
+    },
+    "xdg-basedir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+      "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=",
+      "dev": true
+    },
+    "xml-char-classes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz",
+      "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=",
+      "dev": true
+    },
+    "xml2js": {
+      "version": "0.4.17",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
+      "integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=",
+      "dev": true,
+      "requires": {
+        "sax": "1.2.4",
+        "xmlbuilder": "4.2.1"
+      }
+    },
+    "xmlbuilder": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
+      "integrity": "sha1-qlijBBoGb5DqoWwvU4n/GfP0YaU=",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "xmlhttprequest-ssl": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz",
+      "integrity": "sha1-O3dB/qSoZnWXbpCNKW1ERZYfqmc=",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz",
+      "integrity": "sha1-M1UUSXfQV1fbuG1uOOwFYSOzpm4=",
+      "dev": true,
+      "requires": {
+        "cliui": "3.2.0",
+        "decamelize": "1.2.0",
+        "get-caller-file": "1.0.2",
+        "lodash.assign": "4.2.0",
+        "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",
+        "window-size": "0.2.0",
+        "y18n": "3.2.1",
+        "yargs-parser": "3.2.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "window-size": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz",
+          "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=",
+          "dev": true
+        },
+        "yargs-parser": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz",
+          "integrity": "sha1-UIE1XRnZ0MjF2BrakIy05tGGZk8=",
+          "dev": true,
+          "requires": {
+            "camelcase": "3.0.0",
+            "lodash.assign": "4.2.0"
+          }
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "dev": true,
+      "requires": {
+        "camelcase": "3.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        }
+      }
+    },
+    "yeast": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
+      "dev": true
+    },
+    "zone.js": {
+      "version": "0.8.12",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.12.tgz",
+      "integrity": "sha1-hv9QU8mK7CkaC/S7rFAdaUoFz7s="
+    }
+  }
+}
diff --git a/package.json b/package.json
index 39015496298..700aeece382 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "ionic2",
-  "version": "3.3.0",
+  "version": "3.6.0",
   "description": "A powerful framework for building mobile and progressive web apps with JavaScript and Angular",
   "keywords": [
     "ionic",
@@ -22,7 +22,8 @@
   "scripts": {
     "test": "gulp validate",
     "test:generators": "jasmine-node ./tooling/spec",
-    "link": "gulp release.prepareReleasePackage && cd dist/ionic-angular && npm link"
+    "link": "gulp release.prepareReleasePackage && cd dist/ionic-angular && npm link",
+    "tsc": "tsc --outdir .tmp"
   },
   "dependencies": {
     "@angular/common": "4.1.3",
@@ -38,7 +39,7 @@
     "zone.js": "0.8.12"
   },
   "devDependencies": {
-    "@ionic/app-scripts": "1.3.7",
+    "@ionic/app-scripts": "^1.3.11",
     "@ionic/commit-hooks": "1.0.3",
     "@types/connect": "3.4.30",
     "@types/del": "2.2.31",
@@ -65,6 +66,7 @@
     "conventional-changelog": "1.1.0",
     "core-js": "2.4.1",
     "cpr": "2.0.0",
+    "cross-spawn": "^5.1.0",
     "del": "2.2.2",
     "dgeni": "^0.4.7",
     "dgeni-packages": "^0.16.10",
@@ -91,7 +93,7 @@
     "gulp-scss-lint": "0.4.0",
     "gulp-shell": "0.5.2",
     "gulp-strip-debug": "1.1.0",
-    "gulp-tslint": "6.1.1",
+    "gulp-tslint": "^8.1.1",
     "gulp-typescript": "2.13.6",
     "gulp-uglify": "2.0.0",
     "gulp-util": "3.0.7",
@@ -130,8 +132,8 @@
     "systemjs": "0.19.38",
     "through2": "2.0.1",
     "ts-node": "1.3.0",
-    "tslint": "3.15.1",
-    "tslint-ionic-rules": "0.0.8",
+    "tslint": "^5.4.3",
+    "tslint-ionic-rules": "0.0.11",
     "typescript": "~2.3.3",
     "vinyl": "1.2.0",
     "webpack": "^2.1.0-beta.27",
@@ -146,4 +148,4 @@
   "pre-push#master": [
     "test"
   ]
-}
+}
\ No newline at end of file
diff --git a/scripts/docs/processors/jekyll.js b/scripts/docs/processors/jekyll.js
index 746a7865994..72d1d677a84 100644
--- a/scripts/docs/processors/jekyll.js
+++ b/scripts/docs/processors/jekyll.js
@@ -29,6 +29,14 @@ module.exports = function jekyll(renderDocsProcessor) {
         if (docs[i].href) {
           docs[i].href = doc.href.replace('content/', '');
         }
+        if (docs[i].description) {
+          docs[i].description = docs[i].description.replace(/(\#\#\#).+/g, (section) => {
+            const title = section.replace(/^(\#+\s?)/, '');
+            const segment = title.replace(/[^a-zA-Z0-9]+/g, '-').toLowerCase();
+
+            return `\n<h3><a class="anchor" name="${segment}" href="#${segment}">${title}</a></h3>\n`;
+          });
+        }
       });
 
       docs.push({
diff --git a/scripts/docs/templates/api_index.template.html b/scripts/docs/templates/api_index.template.html
index f9304465838..708204b7573 100644
--- a/scripts/docs/templates/api_index.template.html
+++ b/scripts/docs/templates/api_index.template.html
@@ -7,7 +7,7 @@
 category: api
 id: api
 title: Javascript
-header_sub_title: Extend Ionic even further with the power of AngularJS
+header_sub_title: Extend Ionic even further with the power of Angular
 searchable: false
 ---
 
@@ -15,9 +15,6 @@
 
 <img class="section-header" src="/img/docs/api-intro-header.png" />
 
-
-Ionic takes everything you know and loved about Ionic V1, and builds on top of it to provide a much more flexible framework.
-
 In the API docs, you'll find two kinds of doc pages: Component and Service APIs.
 
 The Component APIs include classes like `Checkbox`, `Toggle` or `Item` and show you how to use them, in addition to listing their selectors, available properties and events.
diff --git a/scripts/docs/templates/common.template.html b/scripts/docs/templates/common.template.html
index 4720214a803..e8a2a704290 100644
--- a/scripts/docs/templates/common.template.html
+++ b/scripts/docs/templates/common.template.html
@@ -242,7 +242,7 @@ <h3><code><$ doc.decorators[0].argumentInfo[0].selector $></code></h3>
 
 <!-- @usage tag -->
 <@ if doc.usage @>
-<h2><a class="anchor" name="usage" href="#usage"></a>Usage</h2>
+<h2><a class="anchor" name="usage" href="#usage">Usage</a></h2>
 <@ block usage @>
 <$ doc.usage | marked $>
 <@ endblock @>
@@ -250,7 +250,7 @@ <h2><a class="anchor" name="usage" href="#usage"></a>Usage</h2>
 
 <!-- @property tags -->
 <@ if doc.properties @>
-<h2><a class="anchor" name="attributes" href="#attributes"></a>Attributes:</h2>
+<h2><a class="anchor" name="attributes" href="#attributes">Attributes</a></h2>
 <table class="table" style="margin:0;">
 <thead>
 <tr>
@@ -293,10 +293,10 @@ <h2><a class="anchor" name="attributes" href="#attributes"></a>Attributes:</h2>
 
 
 <@- if doc.statics.length -@>
-<h2><a class="anchor" name="static-members" href="#static-members"></a>Static Members</h2>
+<h2><a class="anchor" name="static-members" href="#static-members">Static Members</a></h2>
 <@- for method in doc.statics @><@ if not method.internal @>
 <div id="<$ method.name $>"></div>
-<h3><a class="anchor" name="<$ method.name $>" href="#<$ method.name $>"></a><$ functionSyntax(method) $></h3>
+<h3><a class="anchor" name="<$ method.name $>" href="#<$ method.name $>"><$ functionSyntax(method) $></a></h3>
 
 <$ method.description $>
 
@@ -327,14 +327,15 @@ <h4> Method's `this`
 <!-- instance methods on the class -->
 <@- if doc.members and doc.members.length @>
 
-<h2><a class="anchor" name="instance-members" href="#instance-members"></a>Instance Members</h2>
+<h2><a class="anchor" name="instance-members" href="#instance-members">Instance Members</a></h2>
 <@- for method in doc.members @>
 
 <div id="<$ method.name $>"></div>
 
 <h3>
-<a class="anchor" name="<$ method.name $>" href="#<$ method.name $>"></a>
+<a class="anchor" name="<$ method.name $>" href="#<$ method.name $>">
 <$ functionSyntax(method) $>
+</a>
 </h3>
 
 <$ method.description $>
@@ -366,26 +367,26 @@ <h4> Method's `this`
 
 <@- if doc.inputs and doc.inputs.length @>
 <!-- input methods on the class -->
-<h2><a class="anchor" name="input-properties" href="#input-properties"></a>Input Properties</h2>
+<h2><a class="anchor" name="input-properties" href="#input-properties">Input Properties</a></h2>
 <$ inputTable(doc.inputs) $>
 <@- endif -@>
 
 <@- if doc.outputs and doc.outputs.length @>
 <!-- output events on the class -->
-<h2><a class="anchor" name="output-events" href="#output-events"></a>Output Events</h2>
+<h2><a class="anchor" name="output-events" href="#output-events">Output Events</a></h2>
 <$ outputTable(doc.outputs) $>
 <@- endif -@>
 
 
 <@ block advanced @>
 <@- if doc.advanced -@>
-<h2><a class="anchor" name="advanced" href="#advanced"></a>Advanced</h2>
+<h2><a class="anchor" name="advanced" href="#advanced">Advanced</a></h2>
 <$ doc.advanced | marked $>
 <@- endif -@>
 <@ endblock @>
 
 <@ if doc.sassVariables @>
-  <h2 id="sass-variable-header"><a class="anchor" name="sass-variables" href="#sass-variables"></a>Sass Variables</h2>
+  <h2 id="sass-variable-header"><a class="anchor" name="sass-variables" href="#sass-variables">Sass Variables</a></h2>
   <$ sassTable(doc.sassVariables) $>
 <@ endif @>
 
@@ -393,7 +394,7 @@ <h2 id="sass-variable-header"><a class="anchor" name="sass-variables" href="#sas
 <!-- related link -->
 <@- if doc.see @>
 
-<h2><a class="anchor" name="related" href="#related"></a>Related</h2>
+<h2><a class="anchor" name="related" href="#related">Related</a></h2>
 <@ for s in doc.see @>
 <$ s | safe $> <@- if not loop.last @>,<@- endif -@>
 <@- endfor -@>
diff --git a/scripts/gulp/tasks/demos.dev.ts b/scripts/gulp/tasks/demos.dev.ts
index f43f787223a..90575d99469 100644
--- a/scripts/gulp/tasks/demos.dev.ts
+++ b/scripts/gulp/tasks/demos.dev.ts
@@ -11,14 +11,14 @@ task('demos.watch', ['demos.prepare'], (done: Function) => {
     done(new Error(`Usage: gulp e2e.watch --folder modal`));
   }
 
-  serveDemo(folderInfo.componentName).then(() => {
+  serveDemo(folderInfo.componentName, folderInfo.devApp).then(() => {
     done();
   }).catch((err: Error) => {
     done(err);
   });
 });
 
-function serveDemo(folderName: any) {
+function serveDemo(folderName: any, devApp: boolean) {
 
   const ionicAngularDir = join(PROJECT_ROOT, 'src');
   const srcTestRoot = join(DEMOS_ROOT, 'src', folderName);
@@ -40,5 +40,5 @@ function serveDemo(folderName: any) {
   const appNgModulePath = join(srcTestRoot, 'app', 'app.module.ts');
   const distDir = join(distDemoRoot, 'www');
 
-  return runAppScriptsServe(folderName, appEntryPoint, appNgModulePath, ionicAngularDir, distDir, pathToWriteFile, ionicAngularDir, sassConfigPath, copyConfigPath, watchConfigPath);
+  return runAppScriptsServe(folderName, appEntryPoint, appNgModulePath, ionicAngularDir, distDir, pathToWriteFile, ionicAngularDir, sassConfigPath, copyConfigPath, watchConfigPath, devApp);
 }
diff --git a/scripts/gulp/tasks/e2e.dev.ts b/scripts/gulp/tasks/e2e.dev.ts
index e9a5237afca..5fd86d41c7d 100644
--- a/scripts/gulp/tasks/e2e.dev.ts
+++ b/scripts/gulp/tasks/e2e.dev.ts
@@ -13,14 +13,14 @@ task('e2e.watch', ['e2e.prepare'], (done: Function) => {
     return;
   }
 
-  serveTest(folderInfo).then(() => {
+  serveTest(folderInfo, folderInfo.devApp).then(() => {
     done();
   }).catch((err: Error) => {
     done(err);
   });
 });
 
-function serveTest(folderInfo: any) {
+function serveTest(folderInfo: any, devApp: boolean) {
 
   const ionicAngularDir = join(PROJECT_ROOT, 'src');
   const srcTestRoot = join(PROJECT_ROOT, 'src', 'components', folderInfo.componentName, 'test', folderInfo.componentTest);
@@ -47,5 +47,5 @@ function serveTest(folderInfo: any) {
   const appNgModulePath = join(dirname(appEntryPoint), 'app.module.ts');
   const distDir = join(distTestRoot, 'www');
 
-  return runAppScriptsServe(join(folderInfo.componentName, folderInfo.componentTest), appEntryPoint, appNgModulePath, ionicAngularDir, distDir, pathToWriteFile, ionicAngularDir, sassConfigPath, copyConfigPath, null);
+  return runAppScriptsServe(join(folderInfo.componentName, folderInfo.componentTest), appEntryPoint, appNgModulePath, ionicAngularDir, distDir, pathToWriteFile, ionicAngularDir, sassConfigPath, copyConfigPath, null, devApp);
 }
diff --git a/scripts/gulp/tasks/release.ts b/scripts/gulp/tasks/release.ts
index 6b4ccb74d69..65303064ce5 100644
--- a/scripts/gulp/tasks/release.ts
+++ b/scripts/gulp/tasks/release.ts
@@ -1,4 +1,5 @@
-import { exec, spawnSync, spawn } from 'child_process';
+import { exec, spawnSync } from 'child_process';
+import { spawn } from 'cross-spawn';
 import { writeFileSync } from 'fs';
 import * as changelog from 'conventional-changelog';
 import * as GithubApi from 'github';
diff --git a/scripts/gulp/util.ts b/scripts/gulp/util.ts
index e87bf09db32..3333d637c1e 100644
--- a/scripts/gulp/util.ts
+++ b/scripts/gulp/util.ts
@@ -50,6 +50,15 @@ export function createTempTsConfig(includeGlob: string[], target: string, module
   if (config.compilerOptions && config.compilerOptions.outDir) {
     delete config.compilerOptions.outDir;
   }
+
+  // remove linting checks that we do not want in dist
+  if (config.compilerOptions.noUnusedLocals) {
+    delete config.compilerOptions.noUnusedLocals;
+  }
+  if (config.compilerOptions.noUnusedParameters) {
+    delete config.compilerOptions.noUnusedParameters;
+  }
+
   if (config.compilerOptions) {
     config.compilerOptions.module = moduleType;
     config.compilerOptions.target = target;
@@ -190,7 +199,7 @@ export function runWebpack(pathToWebpackConfig: string, done: Function) {
   });
 }
 
-export function runAppScriptsServe(testOrDemoName: string, appEntryPoint: string, appNgModulePath: string, srcDir: string, distDir: string, tsConfig: string, ionicAngularDir: string, sassConfigPath: string, copyConfigPath: string, watchConfigPath: string) {
+export function runAppScriptsServe(testOrDemoName: string, appEntryPoint: string, appNgModulePath: string, srcDir: string, distDir: string, tsConfig: string, ionicAngularDir: string, sassConfigPath: string, copyConfigPath: string, watchConfigPath: string, devApp: boolean) {
   console.log('Running ionic-app-scripts serve with', testOrDemoName);
   const deepLinksDir = dirname(dirname(appNgModulePath));
   let scriptArgs = [
@@ -207,6 +216,9 @@ export function runAppScriptsServe(testOrDemoName: string, appEntryPoint: string
     '--copy', copyConfigPath,
     '--enableLint', 'false'
   ];
+  if (devApp) {
+    scriptArgs.push('--bonjour');
+  }
 
   if (watchConfigPath) {
     scriptArgs.push('--watch');
@@ -349,9 +361,11 @@ export function getFolderInfo() {
     componentName = folderSplit[0];
     componentTest = (folderSplit.length > 1 ? folderSplit[1] : 'basic');
   }
+  const devApp = argv.devapp !== undefined;
   return {
     componentName: componentName,
-    componentTest: componentTest
+    componentTest: componentTest,
+    devApp: devApp
   };
 }
 
diff --git a/scripts/karma/karma.config.ts b/scripts/karma/karma.config.ts
index d84694f60ca..1bb4891fb48 100644
--- a/scripts/karma/karma.config.ts
+++ b/scripts/karma/karma.config.ts
@@ -46,7 +46,7 @@ export function config(config) {
       'dist/ionic-angular/umd/**/!(*spec).js': ['coverage'],
       'dist/ionic-angular/**/*.js': ['sourcemap']
     },
-    reporters: ['dots', 'coverage', 'spec'],
+    reporters: ['coverage', 'spec'],
     specReporter: {
       maxLogLines: 5,         // limit number of lines logged per test
       suppressErrorSummary: true,  // do not print error summary
diff --git a/scripts/templates/page/module.ts.tmpl b/scripts/templates/page/module.ts.tmpl
index 270da9f3dfa..e47f97a187f 100644
--- a/scripts/templates/page/module.ts.tmpl
+++ b/scripts/templates/page/module.ts.tmpl
@@ -9,8 +9,5 @@ import { $CLASSNAME } from './$FILENAME';
   imports: [
     IonicPageModule.forChild($CLASSNAME),
   ],
-  exports: [
-    $CLASSNAME
-  ]
 })
 export class $CLASSNAMEModule {}
diff --git a/scripts/templates/page/ts.tmpl b/scripts/templates/page/ts.tmpl
index a7ee63c910f..e308cadcd4c 100644
--- a/scripts/templates/page/ts.tmpl
+++ b/scripts/templates/page/ts.tmpl
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
+$IMPORTSTATEMENT
 
 /**
  * Generated class for the $CLASSNAME page.
@@ -7,7 +7,7 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
  * See http://ionicframework.com/docs/components/#navigation for more info
  * on Ionic pages and navigation.
  */
-@IonicPage()
+$IONICPAGE
 @Component({
   selector: 'page-$FILENAME',
   templateUrl: '$FILENAME.html',
diff --git a/scripts/templates/pipe/ts.tmpl b/scripts/templates/pipe/ts.tmpl
index 7d1321d33f6..40aa800e19b 100644
--- a/scripts/templates/pipe/ts.tmpl
+++ b/scripts/templates/pipe/ts.tmpl
@@ -7,7 +7,7 @@ import { Pipe, PipeTransform } from '@angular/core';
  * Angular Pipes.
  */
 @Pipe({
-  name: '$FILENAME',
+  name: '$PIPENAME',
 })
 export class $CLASSNAME implements PipeTransform {
   /**
diff --git a/scripts/templates/tabs/ts.tmpl b/scripts/templates/tabs/ts.tmpl
index 1234179394f..b2563f7332f 100755
--- a/scripts/templates/tabs/ts.tmpl
+++ b/scripts/templates/tabs/ts.tmpl
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { IonicPage, NavController } from 'ionic-angular';
+$TABS_IMPORTSTATEMENT
 
 /**
  * Generated class for the $CLASSNAME tabs.
@@ -7,11 +7,11 @@ import { IonicPage, NavController } from 'ionic-angular';
  * See https://angular.io/docs/ts/latest/guide/dependency-injection.html for
  * more info on providers and Angular DI.
  */
+$IONICPAGE
 @Component({
   selector: 'page-$FILENAME',
   templateUrl: '$FILENAME.html'
 })
-@IonicPage()
 export class $CLASSNAME {
 
 $TAB_VARIABLES
diff --git a/src/animations/animation.ts b/src/animations/animation.ts
index 8f1494719c5..956a0df5b2e 100644
--- a/src/animations/animation.ts
+++ b/src/animations/animation.ts
@@ -1,7 +1,6 @@
-import { isDefined, assert } from '../util/util';
+import { assert, isDefined } from '../util/util';
 import { Platform } from '../platform/platform';
 
-
 /**
  * @hidden
  */
@@ -48,12 +47,12 @@ export class Animation {
     if (ele) {
       if (typeof ele === 'string') {
         ele = this.plt.doc().querySelectorAll(ele);
-        for (var i = 0; i < ele.length; i++) {
+        for (let i = 0; i < ele.length; i++) {
           this._addEle(ele[i]);
         }
 
       } else if (ele.length) {
-        for (var i = 0; i < ele.length; i++) {
+        for (let i = 0; i < ele.length; i++) {
           this._addEle(ele[i]);
         }
 
@@ -194,7 +193,7 @@ export class Animation {
 
     if (!fxProp) {
       // first time we've see this EffectProperty
-      var shouldTrans = (ANIMATION_TRANSFORMS[prop] === 1);
+      const shouldTrans = (ANIMATION_TRANSFORMS[prop] === 1);
       fxProp = {
         name: prop,
         trans: shouldTrans,
@@ -262,7 +261,7 @@ export class Animation {
    */
   beforeClearStyles(propertyNames: string[]): Animation {
     this._bfSty = this._bfSty || {};
-    for (var i = 0; i < propertyNames.length; i++) {
+    for (let i = 0; i < propertyNames.length; i++) {
       this._bfSty[propertyNames[i]] = '';
     }
     return this;
@@ -319,7 +318,7 @@ export class Animation {
    */
   afterClearStyles(propertyNames: string[]): Animation {
     this._afSty = this._afSty || {};
-    for (var i = 0; i < propertyNames.length; i++) {
+    for (let i = 0; i < propertyNames.length; i++) {
       this._afSty[propertyNames[i]] = '';
     }
     return this;
@@ -386,7 +385,7 @@ export class Animation {
     this._hasDur = (this.getDuration(opts) > ANIMATION_DURATION_MIN);
 
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       // ******** DOM WRITE ****************
       children[i]._playInit(opts);
     }
@@ -441,7 +440,7 @@ export class Animation {
    */
   _playProgress(opts: PlayOptions) {
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       // ******** DOM WRITE ****************
       children[i]._playProgress(opts);
     }
@@ -474,7 +473,7 @@ export class Animation {
    */
   _playToStep(stepValue: number) {
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       // ******** DOM WRITE ****************
       children[i]._playToStep(stepValue);
     }
@@ -546,7 +545,7 @@ export class Animation {
    */
   _playEnd(stepValue?: number) {
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       // ******** DOM WRITE ****************
       children[i]._playEnd(stepValue);
     }
@@ -583,7 +582,7 @@ export class Animation {
     }
 
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       if (children[i]._hasDuration(opts)) {
         return true;
       }
@@ -602,7 +601,7 @@ export class Animation {
     }
 
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       if (children[i]._hasDomReads()) {
         return true;
       }
@@ -650,16 +649,16 @@ export class Animation {
     if (this._rv) {
       stepValue = ((stepValue * -1) + 1);
     }
-    var i: number, j: number;
-    var finalTransform: string = '';
-    var elements = this._e;
+    let i: number, j: number;
+    let finalTransform: string = '';
+    const elements = this._e;
     for (i = 0; i < effects.length; i++) {
-      var fx = effects[i];
+      const fx = effects[i];
 
       if (fx.from && fx.to) {
-        var fromNum = fx.from.num;
-        var toNum = fx.to.num;
-        var tweenEffect = (fromNum !== toNum);
+        const fromNum = fx.from.num;
+        const toNum = fx.to.num;
+        const tweenEffect = (fromNum !== toNum);
 
         assert(tweenEffect || !this._isAsync, 'in async animations to != from value');
         if (tweenEffect) {
@@ -676,8 +675,8 @@ export class Animation {
 
         } else if (tweenEffect) {
           // EVERYTHING IN BETWEEN
-          var valNum = (((toNum - fromNum) * stepValue) + fromNum);
-          var unit = fx.to.unit;
+          let valNum = (((toNum - fromNum) * stepValue) + fromNum);
+          const unit = fx.to.unit;
           if (unit === 'px') {
             valNum = Math.round(valNum);
           }
@@ -685,7 +684,7 @@ export class Animation {
         }
 
         if (val !== null) {
-          var prop = fx.name;
+          const prop = fx.name;
           if (fx.trans) {
             finalTransform += prop + '(' + val + ') ';
 
@@ -705,7 +704,7 @@ export class Animation {
         finalTransform += 'translateZ(0px)';
       }
 
-      var cssTransform = this.plt.Css.transform;
+      const cssTransform = this.plt.Css.transform;
       for (i = 0; i < elements.length; i++) {
         // ******** DOM WRITE ****************
         (<any>elements[i].style)[cssTransform] = finalTransform;
@@ -734,7 +733,7 @@ export class Animation {
     const cssTransitionTimingFn = Css.transitionTimingFn;
 
     let eleStyle: any;
-    for (var i = 0; i < this._eL; i++) {
+    for (let i = 0; i < this._eL; i++) {
       eleStyle = elements[i].style;
       if (dur > 0) {
         // ******** DOM WRITE ****************
@@ -836,14 +835,14 @@ export class Animation {
    */
   _fireBeforeReadFunc() {
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       // ******** DOM READ ****************
       children[i]._fireBeforeReadFunc();
     }
 
     const readFunctions = this._rdFn;
     if (readFunctions) {
-      for (var i = 0; i < readFunctions.length; i++) {
+      for (let i = 0; i < readFunctions.length; i++) {
         // ******** DOM READ ****************
         readFunctions[i]();
       }
@@ -857,14 +856,14 @@ export class Animation {
    */
   _fireBeforeWriteFunc() {
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       // ******** DOM WRITE ****************
       children[i]._fireBeforeWriteFunc();
     }
 
     const writeFunctions = this._wrFn;
     if (this._wrFn) {
-      for (var i = 0; i < writeFunctions.length; i++) {
+      for (let i = 0; i < writeFunctions.length; i++) {
         // ******** DOM WRITE ****************
         writeFunctions[i]();
       }
@@ -909,7 +908,7 @@ export class Animation {
 
         // inline styles that were added before the animation should be removed
         if (this._bfSty) {
-          for (var prop in this._bfSty) {
+          for (const prop in this._bfSty) {
             // ******** DOM WRITE ****************
             (<any>ele).style[prop] = '';
           }
@@ -936,7 +935,7 @@ export class Animation {
 
         // inline styles to add after the animation
         if (this._afSty) {
-          for (var prop in this._afSty) {
+          for (const prop in this._afSty) {
             // ******** DOM WRITE ****************
             (<any>ele).style[prop] = this._afSty[prop];
           }
@@ -956,8 +955,8 @@ export class Animation {
     let willChange: string;
     if (addWillChange && effects) {
       wc = [];
-      for (var i = 0; i < effects.length; i++) {
-        var propWC = effects[i].wc;
+      for (let i = 0; i < effects.length; i++) {
+        const propWC = effects[i].wc;
         if (propWC === 'webkitTransform') {
           wc.push('transform', '-webkit-transform');
 
@@ -969,7 +968,7 @@ export class Animation {
     } else {
       willChange = '';
     }
-    for (var i = 0; i < this._eL; i++) {
+    for (let i = 0; i < this._eL; i++) {
       // ******** DOM WRITE ****************
       (<any>this._e[i]).style.willChange = willChange;
     }
@@ -996,7 +995,7 @@ export class Animation {
    */
   _progressStart() {
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       // ******** DOM WRITE ****************
       children[i]._progressStart();
     }
@@ -1017,7 +1016,7 @@ export class Animation {
     stepValue = Math.min(1, Math.max(0, stepValue));
 
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       // ******** DOM WRITE ****************
       children[i].progressStep(stepValue);
     }
@@ -1076,7 +1075,7 @@ export class Animation {
    */
   _progressEnd(shouldComplete: boolean, stepValue: number, dur: number, isAsync: boolean) {
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       // ******** DOM WRITE ****************
       children[i]._progressEnd(shouldComplete, stepValue, dur, isAsync);
     }
@@ -1127,7 +1126,7 @@ export class Animation {
    */
   _didFinishAll(hasCompleted: boolean, finishAsyncAnimations: boolean, finishNoDurationAnimations: boolean) {
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       children[i]._didFinishAll(hasCompleted, finishAsyncAnimations, finishNoDurationAnimations);
     }
 
@@ -1146,14 +1145,14 @@ export class Animation {
 
     if (this._fFn) {
       // run all finish callbacks
-      for (var i = 0; i < this._fFn.length; i++) {
+      for (let i = 0; i < this._fFn.length; i++) {
         this._fFn[i](this);
       }
     }
 
     if (this._fOneFn) {
       // run all "onetime" finish callbacks
-      for (var i = 0; i < this._fOneFn.length; i++) {
+      for (let i = 0; i < this._fOneFn.length; i++) {
         this._fOneFn[i](this);
       }
       this._fOneFn.length = 0;
@@ -1165,7 +1164,7 @@ export class Animation {
    */
   reverse(shouldReverse: boolean = true): Animation {
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       children[i].reverse(shouldReverse);
     }
     this._rv = shouldReverse;
@@ -1177,7 +1176,7 @@ export class Animation {
    */
   destroy() {
     const children = this._c;
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       children[i].destroy();
     }
 
@@ -1202,9 +1201,9 @@ export class Animation {
    */
   _transEl(): HTMLElement {
     // get the lowest level element that has an Animation
-    var targetEl: HTMLElement;
+    let targetEl: HTMLElement;
 
-    for (var i = 0; i < this._cL; i++) {
+    for (let i = 0; i < this._cL; i++) {
       targetEl = this._c[i]._transEl();
       if (targetEl) {
         return targetEl;
diff --git a/src/components/action-sheet/action-sheet-component.ts b/src/components/action-sheet/action-sheet-component.ts
index 7cbb802ce6b..09240908b8e 100644
--- a/src/components/action-sheet/action-sheet-component.ts
+++ b/src/components/action-sheet/action-sheet-component.ts
@@ -1,11 +1,10 @@
 import { Component, ElementRef, HostListener, Renderer, ViewEncapsulation } from '@angular/core';
 
-import { ActionSheetOptions, ActionSheetButton } from './action-sheet-options';
+import { ActionSheetButton, ActionSheetOptions } from './action-sheet-options';
 import { assert } from '../../util/util';
-import { BlockerDelegate, GestureController, BLOCK_ALL } from '../../gestures/gesture-controller';
+import { BLOCK_ALL, BlockerDelegate, GestureController } from '../../gestures/gesture-controller';
 import { Config } from '../../config/config';
 import { KEY_ESCAPE } from '../../platform/key';
-import { Platform } from '../../platform/platform';
 import { NavParams } from '../../navigation/nav-params';
 import { NavOptions } from '../../navigation/nav-util';
 import { ViewController } from '../../navigation/view-controller';
@@ -57,7 +56,6 @@ export class ActionSheetCmp {
   constructor(
     private _viewCtrl: ViewController,
     config: Config,
-    private _plt: Platform,
     private _elementRef: ElementRef,
     gestureCtrl: GestureController,
     params: NavParams,
@@ -117,8 +115,6 @@ export class ActionSheetCmp {
   }
 
   ionViewDidEnter() {
-    this._plt.focusOutActiveElement();
-
     const focusableEle = this._elementRef.nativeElement.querySelector('button');
     if (focusableEle) {
       focusableEle.focus();
diff --git a/src/components/action-sheet/action-sheet-options.ts b/src/components/action-sheet/action-sheet-options.ts
index 6ff277df9ac..a4ae6a76a4c 100644
--- a/src/components/action-sheet/action-sheet-options.ts
+++ b/src/components/action-sheet/action-sheet-options.ts
@@ -13,4 +13,4 @@ export interface ActionSheetButton {
   icon?: string;
   cssClass?: string;
   handler?: () => boolean|void;
-};
+}
diff --git a/src/components/action-sheet/action-sheet.ts b/src/components/action-sheet/action-sheet.ts
index da6c57458b5..0e6bdabe513 100644
--- a/src/components/action-sheet/action-sheet.ts
+++ b/src/components/action-sheet/action-sheet.ts
@@ -1,6 +1,6 @@
 import { ActionSheetCmp } from './action-sheet-component';
-import { ActionSheetOptions, ActionSheetButton } from './action-sheet-options';
-import { ActionSheetSlideIn, ActionSheetMdSlideIn, ActionSheetSlideOut, ActionSheetMdSlideOut, ActionSheetWpSlideIn, ActionSheetWpSlideOut } from './action-sheet-transitions';
+import { ActionSheetButton, ActionSheetOptions } from './action-sheet-options';
+import { ActionSheetMdSlideIn, ActionSheetMdSlideOut, ActionSheetSlideIn, ActionSheetSlideOut, ActionSheetWpSlideIn, ActionSheetWpSlideOut } from './action-sheet-transitions';
 import { App } from '../app/app';
 import { Config } from '../../config/config';
 import { isPresent } from '../../util/util';
diff --git a/src/components/alert/alert-component.ts b/src/components/alert/alert-component.ts
index 836f34f7255..1bd9cdeb331 100644
--- a/src/components/alert/alert-component.ts
+++ b/src/components/alert/alert-component.ts
@@ -2,14 +2,14 @@ import { Component, ElementRef, HostListener, Renderer, ViewEncapsulation } from
 
 import { Config } from '../../config/config';
 import { NON_TEXT_INPUT_REGEX } from '../../util/dom';
-import { GestureController, BlockerDelegate, BLOCK_ALL } from '../../gestures/gesture-controller';
-import { isPresent, assert } from '../../util/util';
+import { BLOCK_ALL, BlockerDelegate, GestureController } from '../../gestures/gesture-controller';
+import { assert, isPresent } from '../../util/util';
 import { KEY_ENTER, KEY_ESCAPE } from '../../platform/key';
 import { NavParams } from '../../navigation/nav-params';
 import { NavOptions } from '../../navigation/nav-util';
 import { Platform } from '../../platform/platform';
 import { ViewController } from '../../navigation/view-controller';
-import { AlertInputOptions, AlertOptions, AlertButton } from './alert-options';
+import { AlertButton, AlertInputOptions, AlertOptions } from './alert-options';
 
 
 /**
@@ -84,6 +84,7 @@ export class AlertCmp {
   msgId: string;
   subHdrId: string;
   mode: string;
+  keyboardResizes: boolean;
   gestureBlocker: BlockerDelegate;
 
   constructor(
@@ -99,6 +100,7 @@ export class AlertCmp {
     this.gestureBlocker = gestureCtrl.createBlocker(BLOCK_ALL);
     this.d = params.data;
     this.mode = this.d.mode || config.get('mode');
+    this.keyboardResizes = config.getBoolean('keyboardResizes', false);
     _renderer.setElementClass(_elementRef.nativeElement, `alert-${this.mode}`, true);
 
     if (this.d.cssClass) {
@@ -178,7 +180,7 @@ export class AlertCmp {
     }
 
     const hasTextInput = (this.d.inputs.length && this.d.inputs.some(i => !(NON_TEXT_INPUT_REGEX.test(i.type))));
-    if (hasTextInput && this._plt.is('mobile')) {
+    if (!this.keyboardResizes && hasTextInput && this._plt.is('mobile')) {
       // this alert has a text input and it's on a mobile device so we should align
       // the alert up high because we need to leave space for the virtual keboard
       // this also helps prevent the layout getting all messed up from
@@ -192,18 +194,10 @@ export class AlertCmp {
   }
 
   ionViewDidLeave() {
-    this._plt.focusOutActiveElement();
     this.gestureBlocker.unblock();
   }
 
-  ionViewWillLeave() {
-    this._plt.focusOutActiveElement();
-  }
-
   ionViewDidEnter() {
-    // focus out of the active element
-    this._plt.focusOutActiveElement();
-
     // set focus on the first input or button in the alert
     // note that this does not always work and bring up the keyboard on
     // devices since the focus command must come from the user's touch event
diff --git a/src/components/alert/alert-options.ts b/src/components/alert/alert-options.ts
index 454b895ca62..dddded81063 100644
--- a/src/components/alert/alert-options.ts
+++ b/src/components/alert/alert-options.ts
@@ -29,4 +29,4 @@ export interface AlertButton {
   role?: string;
   cssClass?: string;
   handler?: (value: any) => boolean|void;
-};
+}
diff --git a/src/components/alert/alert.ts b/src/components/alert/alert.ts
index 8ab31945a82..ade9a59ae97 100644
--- a/src/components/alert/alert.ts
+++ b/src/components/alert/alert.ts
@@ -1,7 +1,7 @@
 import { App } from '../app/app';
 import { AlertCmp } from './alert-component';
-import { AlertOptions, AlertInputOptions, AlertButton } from './alert-options';
-import { AlertPopIn, AlertPopOut, AlertMdPopIn, AlertMdPopOut, AlertWpPopIn, AlertWpPopOut } from './alert-transitions';
+import { AlertButton, AlertInputOptions, AlertOptions } from './alert-options';
+import { AlertMdPopIn, AlertMdPopOut, AlertPopIn, AlertPopOut, AlertWpPopIn, AlertWpPopOut } from './alert-transitions';
 import { Config } from '../../config/config';
 import { isPresent } from '../../util/util';
 import { NavOptions } from '../../navigation/nav-util';
diff --git a/src/components/alert/test/dismiss/app.module.ts b/src/components/alert/test/dismiss/app.module.ts
index c901155b36c..fea4388f38b 100644
--- a/src/components/alert/test/dismiss/app.module.ts
+++ b/src/components/alert/test/dismiss/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, AlertController, LoadingController, NavController } from '../../../..';
+import { AlertController, IonicApp, IonicModule, LoadingController, NavController } from '../../../..';
 import { FormBuilder, Validators } from '@angular/forms';
 
 
diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index aa76a863759..9cdfddd293d 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -1,14 +1,15 @@
 import { EventEmitter, Injectable, Optional } from '@angular/core';
-import { Title, DOCUMENT } from '@angular/platform-browser';
+import { DOCUMENT, Title } from '@angular/platform-browser';
 
 import { IonicApp } from './app-root';
 import * as Constants from './app-constants';
 import { ClickBlock } from './click-block';
-import { runInDev, assert } from '../../util/util';
+import { assert, runInDev } from '../../util/util';
 import { Config } from '../../config/config';
-import { isNav, NavOptions, DIRECTION_FORWARD, DIRECTION_BACK } from '../../navigation/nav-util';
+import { DIRECTION_BACK, DIRECTION_FORWARD, NavOptions, isTabs } from '../../navigation/nav-util';
 import { MenuController } from './menu-controller';
-import { NavController } from '../../navigation/nav-controller';
+import { NavigationContainer } from '../../navigation/navigation-container';
+import { NavControllerBase } from '../../navigation/nav-controller-base';
 import { Platform } from '../../platform/platform';
 import { ViewController } from '../../navigation/view-controller';
 import { IOSTransition } from '../../transitions/transition-ios';
@@ -28,8 +29,9 @@ export class App {
   private _scrollTime: number = 0;
   private _title: string = '';
   private _titleSrv: Title = new Title(DOCUMENT);
-  private _rootNav: NavController = null;
+  private _rootNavs = new Map<string, NavigationContainer>();
   private _disableScrollAssist: boolean;
+  private _didScroll = false;
 
   /**
    * @hidden
@@ -87,6 +89,11 @@ export class App {
     _plt.registerBackButtonAction(this.goBack.bind(this));
     this._disableScrollAssist = _config.getBoolean('disableScrollAssist', false);
 
+    const blurring = _config.getBoolean('inputBlurring', false);
+    if (blurring) {
+      this._enableInputBlurring();
+    }
+
     runInDev(() => {
       // During developement, navPop can be triggered by calling
       const win = <any>_plt.win();
@@ -179,6 +186,7 @@ export class App {
    */
   setScrolling() {
     this._scrollTime = Date.now() + ACTIVE_SCROLLING_TIME;
+    this._didScroll = true;
   }
 
   /**
@@ -198,28 +206,82 @@ export class App {
   }
 
   /**
-   * @return {NavController} Returns the active NavController. Using this method is preferred when we need access to the top-level navigation controller while on the outside views and handlers like `registerBackButtonAction()`
+   * @return {NavController} Returns the first Active Nav Controller from the list. This method is deprecated
+   */
+  getActiveNav(): NavControllerBase {
+    console.warn('(getActiveNav) is deprecated and will be removed in the next major release. Use getActiveNavs instead.');
+    const navs = this.getActiveNavs();
+    if (navs && navs.length) {
+      return navs[0];
+    }
+    return null;
+  }
+
+  /**
+   * @return {NavController[]} Returns the active NavControllers. Using this method is preferred when we need access to the top-level navigation controller while on the outside views and handlers like `registerBackButtonAction()`
    */
-  getActiveNav(): NavController {
+  getActiveNavs(rootNavId?: string): NavControllerBase[] {
     const portal = this._appRoot._getPortal(Constants.PORTAL_MODAL);
     if (portal.length() > 0) {
-      return findTopNav(portal);
+      return <NavControllerBase[]> findTopNavs(portal);
     }
-    return findTopNav(this._rootNav || null);
+    if (!this._rootNavs || !this._rootNavs.size) {
+      return [];
+    }
+    if (this._rootNavs.size === 1) {
+      return <NavControllerBase[]> findTopNavs(this._rootNavs.values().next().value);
+    }
+    if (rootNavId) {
+      return <NavControllerBase[]> findTopNavs(this._rootNavs.get(rootNavId));
+    }
+    // fallback to just using all root names
+    let activeNavs: NavigationContainer[] = [];
+    this._rootNavs.forEach(nav => {
+      const topNavs = findTopNavs(nav);
+      activeNavs = activeNavs.concat(topNavs);
+    });
+    return <NavControllerBase[]> activeNavs;
+  }
+
+  getRootNav(): any {
+    console.warn('(getRootNav) is deprecated and will be removed in the next major release. Use getRootNavById instead.');
+    const rootNavs = this.getRootNavs();
+    if (rootNavs.length === 0) {
+      return null;
+    } else if (rootNavs.length > 1) {
+      console.warn('(getRootNav) there are multiple root navs, use getRootNavs instead');
+    }
+    return rootNavs[0];
+  }
+
+  getRootNavs(): any[] {
+    const navs: NavigationContainer[] = [];
+    this._rootNavs.forEach(nav => navs.push(nav));
+    return navs;
   }
 
   /**
    * @return {NavController} Returns the root NavController
    */
-  getRootNav(): NavController {
-    return this._rootNav;
+  getRootNavById(navId: string): NavigationContainer {
+    return this._rootNavs.get(navId);
   }
 
   /**
    * @hidden
    */
-  _setRootNav(nav: any) {
-    this._rootNav = nav;
+  registerRootNav(nav: NavigationContainer) {
+    this._rootNavs.set(nav.id, nav);
+  }
+
+
+  getActiveNavContainers(): NavigationContainer[] {
+    // for each root nav container, get it's active nav
+    let list: NavigationContainer[] = [];
+    this._rootNavs.forEach((container: NavigationContainer) => {
+      list = list.concat(findTopNavs(container));
+    });
+    return list;
   }
 
   /**
@@ -234,7 +296,6 @@ export class App {
     // TODO: move _setNav() to the earlier stages of NavController. _queueTrns()
     enteringView._setNav(portal);
 
-    opts.keyboardClose = false;
     opts.direction = DIRECTION_FORWARD;
 
     if (!opts.animation) {
@@ -242,7 +303,7 @@ export class App {
     }
 
     enteringView.setLeavingOpts({
-      keyboardClose: false,
+      keyboardClose: opts.keyboardClose,
       direction: DIRECTION_BACK,
       animation: enteringView.getTransitionName(DIRECTION_BACK),
       ev: opts.ev
@@ -260,7 +321,7 @@ export class App {
     }
 
     const navPromise = this.navPop();
-    if (navPromise === null) {
+    if (!navPromise) {
       // no views to go back to
       // let's exit the app
       if (this._config.getBoolean('navExitApp', true)) {
@@ -275,7 +336,7 @@ export class App {
    * @hidden
    */
   navPop(): Promise<any> {
-    if (!this._rootNav || !this.isEnabled()) {
+    if (!this._rootNavs || this._rootNavs.size === 0 || !this.isEnabled()) {
       return Promise.resolve();
     }
 
@@ -284,43 +345,140 @@ export class App {
     if (portal.length() > 0) {
       return Promise.resolve();
     }
-    // next get the active nav, check itself and climb up all
-    // of its parent navs until it finds a nav that can pop
-    return recursivePop(this.getActiveNav());
+
+    let navToPop: NavControllerBase = null;
+    let mostRecentVC: ViewController = null;
+    this._rootNavs.forEach((navContainer: NavigationContainer) => {
+      const activeNavs = this.getActiveNavs(navContainer.id);
+      const poppableNavs = activeNavs.map(activeNav => getPoppableNav(activeNav)).filter(nav => !!nav);
+      poppableNavs.forEach(poppable => {
+        const topViewController = poppable.last();
+        if (poppable._isPortal || (topViewController && poppable.length() > 1 && (!mostRecentVC || topViewController._ts >=  mostRecentVC._ts))) {
+          mostRecentVC = topViewController;
+          navToPop = poppable;
+        }
+      });
+    });
+    if (navToPop) {
+      return navToPop.pop();
+    }
   }
 
-}
+  /**
+   * @hidden
+   */
+  _enableInputBlurring() {
+    console.debug('App: _enableInputBlurring');
+    let focused = true;
+    const self = this;
+    const platform = this._plt;
 
-function recursivePop(nav: any): Promise<any> {
-  if (!nav) {
+    platform.registerListener(platform.doc(), 'focusin', onFocusin, { capture: true, zone: false, passive: true });
+    platform.registerListener(platform.doc(), 'touchend', onTouchend, { capture: false, zone: false, passive: true });
+
+    function onFocusin() {
+      focused = true;
+    }
+
+    function onTouchend(ev: any) {
+      // if app did scroll return early
+      if (self._didScroll) {
+        self._didScroll = false;
+        return;
+      }
+      const active = <HTMLElement> self._plt.getActiveElement();
+      if (!active) {
+        return;
+      }
+      // only blur if the active element is a text-input or a textarea
+      if (SKIP_BLURRING.indexOf(active.tagName) === -1) {
+        return;
+      }
+
+      // if the selected target is the active element, do not blur
+      const tapped = ev.target;
+      if (tapped === active) {
+        return;
+      }
+      if (SKIP_BLURRING.indexOf(tapped.tagName) >= 0) {
+        return;
+      }
+
+      // skip if div is a cover
+      if (tapped.classList.contains('input-cover')) {
+        return;
+      }
+
+      focused = false;
+      // TODO: find a better way, why 50ms?
+      platform.timeout(() => {
+        if (!focused) {
+          active.blur();
+        }
+      }, 50);
+    }
+  }
+
+  getNavByIdOrName(id: string) {
+    const navs = Array.from(this._rootNavs.values());
+    for (const navContainer of navs) {
+      const match = getNavByIdOrName(navContainer, id);
+      if (match) {
+        return match;
+      }
+    }
     return null;
   }
-  if (isNav(nav)) {
-    var len = nav.length();
-    if (len > 1 || (nav._isPortal && len > 0)) {
-      // this nav controller has more than one view
-      // pop the current view on this nav and we're done here
-      console.debug('app, goBack pop nav');
-      return nav.pop();
+
+}
+
+export function getNavByIdOrName(nav: NavigationContainer, id: string): NavigationContainer {
+  if (nav.id === id || nav.name === id) {
+    return nav;
+  }
+  for (const child of nav.getAllChildNavs()) {
+    const tmp = getNavByIdOrName(child, id);
+    if (tmp) {
+      return tmp;
     }
   }
-  // try again using the parent nav (if there is one)
-  return recursivePop(nav.parent);
+  return null;
 }
 
-function findTopNav(nav: NavController) {
-  var activeChildNav: any;
+function getPoppableNav(nav: NavControllerBase): NavControllerBase {
+  if (!nav) {
+    return null;
+  }
 
-  while (nav) {
-    activeChildNav = nav.getActiveChildNav();
-    if (!activeChildNav) {
-      break;
-    }
-    nav = activeChildNav;
+  if (isTabs(nav)) {
+    // tabs aren't a nav, so just call this function again immediately on the parent on tabs
+    return getPoppableNav(nav.parent);
+  }
+  const len = nav.length();
+  if (len > 1 || (nav._isPortal && len > 0)) {
+    // this nav controller has more than one view
+    // use this nav!
+    return nav;
   }
+  // try again using the parent nav (if there is one)
+  return getPoppableNav(nav.parent);
+}
 
-  return nav;
+export function findTopNavs(nav: NavigationContainer): NavigationContainer[] {
+  let containers: NavigationContainer[] = [];
+  const childNavs = nav.getActiveChildNavs();
+  if (!childNavs || !childNavs.length) {
+    containers.push(nav);
+  } else {
+    childNavs.forEach(childNav => {
+      const topNavs = findTopNavs(childNav);
+      containers = containers.concat(topNavs);
+    });
+  }
+  return containers;
 }
 
+
+const SKIP_BLURRING = ['INPUT', 'TEXTAREA', 'ION-INPUT', 'ION-TEXTAREA'];
 const ACTIVE_SCROLLING_TIME = 100;
 const CLICK_BLOCK_BUFFER_IN_MILLIS = 64;
diff --git a/src/components/app/click-block.ts b/src/components/app/click-block.ts
index 92a8f8bdefe..f71c9d804b4 100644
--- a/src/components/app/click-block.ts
+++ b/src/components/app/click-block.ts
@@ -1,4 +1,4 @@
-import { Directive, ElementRef, forwardRef, Inject, Renderer } from '@angular/core';
+import { Directive, ElementRef, Inject, Renderer, forwardRef } from '@angular/core';
 
 import { App } from '../app/app';
 import { Config } from '../../config/config';
diff --git a/src/components/app/menu-controller.ts b/src/components/app/menu-controller.ts
index 275c8da1a55..896e06a0c0a 100644
--- a/src/components/app/menu-controller.ts
+++ b/src/components/app/menu-controller.ts
@@ -1,6 +1,6 @@
 import { Menu, MenuType } from './menu-interface';
 import { Platform } from '../../platform/platform';
-import { removeArrayItem, assert } from '../../util/util';
+import { assert, removeArrayItem  } from '../../util/util';
 
 
 /**
diff --git a/src/components/app/menu-interface.ts b/src/components/app/menu-interface.ts
index 1d3d011f039..6eeaf345c85 100644
--- a/src/components/app/menu-interface.ts
+++ b/src/components/app/menu-interface.ts
@@ -27,7 +27,7 @@ export interface Menu {
   getBackdropElement(): HTMLElement;
   _canOpen(): boolean;
   persistent: boolean;
-};
+}
 
 export interface MenuType {
   ani: Animation;
@@ -37,4 +37,4 @@ export interface MenuType {
   setProgessStep(stepValue: number): void;
   setProgressEnd(shouldComplete: boolean, currentStepValue: number, velocity: number, done: Function): void;
   destroy(): void;
-};
+}
diff --git a/src/components/app/overlay-portal.ts b/src/components/app/overlay-portal.ts
index 78b213efc35..db5d14d2dba 100644
--- a/src/components/app/overlay-portal.ts
+++ b/src/components/app/overlay-portal.ts
@@ -1,12 +1,12 @@
-import { ComponentFactoryResolver, Directive, ElementRef, ErrorHandler, forwardRef, Inject, Input, NgZone, Optional, Renderer, ViewContainerRef } from '@angular/core';
+import { ComponentFactoryResolver, Directive, ElementRef, ErrorHandler, Inject, Input, NgZone, Optional, Renderer, ViewContainerRef, forwardRef } from '@angular/core';
 
 import { App } from './app';
 import { Config } from '../../config/config';
 import { DeepLinker } from '../../navigation/deep-linker';
 import { DomController } from '../../platform/dom-controller';
 import { GestureController } from '../../gestures/gesture-controller';
-import { Keyboard } from '../../platform/keyboard';
 import { NavControllerBase } from '../../navigation/nav-controller-base';
+import { NavigationContainer } from '../../navigation/navigation-container';
 import { Platform } from '../../platform/platform';
 import { TransitionController } from '../../transitions/transition-controller';
 import { ViewController } from '../../navigation/view-controller';
@@ -17,12 +17,11 @@ import { ViewController } from '../../navigation/view-controller';
 @Directive({
   selector: '[overlay-portal]',
 })
-export class OverlayPortal extends NavControllerBase {
+export class OverlayPortal extends NavControllerBase implements NavigationContainer {
   constructor(
     @Inject(forwardRef(() => App)) app: App,
     config: Config,
     plt: Platform,
-    keyboard: Keyboard,
     elementRef: ElementRef,
     zone: NgZone,
     renderer: Renderer,
@@ -34,7 +33,7 @@ export class OverlayPortal extends NavControllerBase {
     domCtrl: DomController,
     errHandler: ErrorHandler
   ) {
-    super(null, app, config, plt, keyboard, elementRef, zone, renderer, cfr, gestureCtrl, transCtrl, linker, domCtrl, errHandler);
+    super(null, app, config, plt, elementRef, zone, renderer, cfr, gestureCtrl, transCtrl, linker, domCtrl, errHandler);
     this._isPortal = true;
     this._init = true;
     this.setViewport(viewPort);
@@ -57,4 +56,17 @@ export class OverlayPortal extends NavControllerBase {
     this.destroy();
   }
 
+  /*
+   * @private
+   */
+  getType() {
+    return 'portal';
+  }
+
+  /*
+   * @private
+   */
+  getSecondaryIdentifier(): string {
+    return null;
+  }
 }
diff --git a/src/components/app/test/app.spec.ts b/src/components/app/test/app.spec.ts
index 17c4ae96f8b..c84afbc404f 100644
--- a/src/components/app/test/app.spec.ts
+++ b/src/components/app/test/app.spec.ts
@@ -1,7 +1,7 @@
 import { App } from '../app';
 import { ClickBlock } from '../click-block';
 import { Config } from '../../../config/config';
-import { mockApp, mockConfig, mockElementRef, mockNavController, mockPlatform, MockPlatform, mockRenderer, mockTab, mockTabs, mockView, mockViews } from '../../../util/mock-providers';
+import { MockPlatform, mockApp, mockConfig, mockElementRef, mockNavController, mockPlatform, mockRenderer, mockTab, mockTabs, mockView, mockViews } from '../../../util/mock-providers';
 import { OverlayPortal } from '../overlay-portal';
 import { PORTAL_MODAL } from '../app-constants';
 
@@ -11,12 +11,12 @@ describe('App', () => {
   describe('goBack', () => {
 
     it('should not select the previous tab', () => {
-      let nav = mockNavController();
-      app._setRootNav(nav);
+      const nav = mockNavController();
+      app.registerRootNav(nav);
 
-      let tabs = mockTabs();
-      let tab1 = mockTab(tabs);
-      let tab2 = mockTab(tabs);
+      const tabs = mockTabs();
+      const tab1 = mockTab(tabs);
+      const tab2 = mockTab(tabs);
 
       tab1.root = 'Page1';
       tab2.root = 'Page2';
@@ -44,71 +44,79 @@ describe('App', () => {
     });
 
     it('should pop from the active tab, when tabs is nested is the root nav', () => {
-      let nav = mockNavController();
-      app._setRootNav(nav);
+      const nav = mockNavController();
+      app.registerRootNav(nav);
 
-      let tabs = mockTabs();
-      mockTab(tabs);
-      let tab2 = mockTab(tabs);
+      const tabs = mockTabs();
       mockTab(tabs);
       nav.registerChildNav(tabs);
 
+      const tab1 = mockTab(tabs);
+      const tab2 = mockTab(tabs);
+
       tab2.setSelected(true);
 
       spyOn(plt, 'exitApp');
-      spyOn(tab2, 'pop');
+      spyOn(tab1, 'pop').and.returnValue(Promise.resolve());
+      spyOn(tab2, 'pop').and.returnValue(Promise.resolve());
       spyOn(portal, 'pop');
 
-      let view1 = mockView();
-      let view2 = mockView();
+      const view1 = mockView();
+      const view2 = mockView();
       tab2._views = [view1, view2];
+      tab1._views = [mockView()];
 
       app.goBack();
 
+      expect(tab1.pop).not.toHaveBeenCalled();
       expect(tab2.pop).toHaveBeenCalled();
       expect(portal.pop).not.toHaveBeenCalled();
       expect(plt.exitApp).not.toHaveBeenCalled();
     });
 
     it('should pop from the active tab, when tabs is the root', () => {
-      let tabs = mockTabs();
+      const tabs = mockTabs();
       mockTab(tabs);
-      let tab2 = mockTab(tabs);
-      mockTab(tabs);
-      app._setRootNav(tabs);
+      app.registerRootNav(tabs);
+
+      const tab1 = mockTab(tabs);
+      const tab2 = mockTab(tabs);
 
       tab2.setSelected(true);
 
       spyOn(plt, 'exitApp');
-      spyOn(tab2, 'pop');
+      spyOn(tab1, 'pop').and.returnValue(Promise.resolve());
+      spyOn(tab2, 'pop').and.returnValue(Promise.resolve());
 
-      let view1 = mockView();
-      let view2 = mockView();
+      const view1 = mockView();
+      const view2 = mockView();
       tab2._views = [view1, view2];
 
       app.goBack();
 
+      expect(tab1.pop).not.toHaveBeenCalled();
       expect(tab2.pop).toHaveBeenCalled();
       expect(plt.exitApp).not.toHaveBeenCalled();
     });
 
     it('should pop the root nav when nested nav has less than 2 views', () => {
-      let rootNav = mockNavController();
-      let nestedNav = mockNavController();
-      rootNav.registerChildNav(nestedNav);
+      const rootNav = mockNavController();
+      app.registerRootNav(rootNav);
+
+      const nestedNav = mockNavController();
       nestedNav.parent = rootNav;
-      app._setRootNav(rootNav);
+      rootNav.registerChildNav(nestedNav);
 
       spyOn(plt, 'exitApp');
-      spyOn(rootNav, 'pop');
-      spyOn(nestedNav, 'pop');
-      spyOn(portal, 'pop');
+      spyOn(rootNav, 'pop').and.returnValue(Promise.resolve());
+      spyOn(nestedNav, 'pop').and.returnValue(Promise.resolve());
+      spyOn(portal, 'pop').and.returnValue(Promise.resolve());
 
-      let rootView1 = mockView();
-      let rootView2 = mockView();
+      const rootView1 = mockView();
+      const rootView2 = mockView();
       mockViews(rootNav, [rootView1, rootView2]);
 
-      let nestedView1 = mockView();
+      const nestedView1 = mockView();
       mockViews(nestedNav, [nestedView1]);
 
       app.goBack();
@@ -120,22 +128,22 @@ describe('App', () => {
     });
 
     it('should pop a view from the nested nav that has more than 1 view', () => {
-      let rootNav = mockNavController();
-      let nestedNav = mockNavController();
-      app._setRootNav(rootNav);
+      const rootNav = mockNavController();
+      const nestedNav = mockNavController();
+      app.registerRootNav(rootNav);
       rootNav.registerChildNav(nestedNav);
 
       spyOn(plt, 'exitApp');
       spyOn(rootNav, 'pop');
-      spyOn(nestedNav, 'pop');
+      spyOn(nestedNav, 'pop').and.returnValue(Promise.resolve());
       spyOn(portal, 'pop');
 
-      let rootView1 = mockView();
-      let rootView2 = mockView();
+      const rootView1 = mockView();
+      const rootView2 = mockView();
       mockViews(rootNav, [rootView1, rootView2]);
 
-      let nestedView1 = mockView();
-      let nestedView2 = mockView();
+      const nestedView1 = mockView();
+      const nestedView2 = mockView();
       mockViews(nestedNav, [nestedView1, nestedView2]);
 
       app.goBack();
@@ -147,18 +155,18 @@ describe('App', () => {
     });
 
     it('should pop the overlay in the portal of the root nav', (done: Function) => {
-      let nav = mockNavController();
-      app._setRootNav(nav);
+      const nav = mockNavController();
+      app.registerRootNav(nav);
 
       spyOn(plt, 'exitApp');
       spyOn(nav, 'pop');
       spyOn(portal, 'pop').and.returnValue(Promise.resolve());
 
-      let view1 = mockView();
-      let view2 = mockView();
+      const view1 = mockView();
+      const view2 = mockView();
       mockViews(nav, [view1, view2]);
 
-      let overlay1 = mockView();
+      const overlay1 = mockView();
       mockViews(portal, [overlay1]);
 
       app.goBack().then(() => {
@@ -173,15 +181,15 @@ describe('App', () => {
     });
 
     it('should pop the second view in the root nav', () => {
-      let nav = mockNavController();
-      app._setRootNav(nav);
+      const nav = mockNavController();
+      app.registerRootNav(nav);
 
       spyOn(plt, 'exitApp');
-      spyOn(nav, 'pop');
+      spyOn(nav, 'pop').and.returnValue(Promise.resolve());
       spyOn(portal, 'pop');
 
-      let view1 = mockView();
-      let view2 = mockView();
+      const view1 = mockView();
+      const view2 = mockView();
       mockViews(nav, [view1, view2]);
 
       app.goBack();
@@ -192,17 +200,17 @@ describe('App', () => {
     });
 
     it('should exit app when only one view in the root nav', () => {
-      let nav = mockNavController();
-      app._setRootNav(nav);
+      const nav = mockNavController();
+      app.registerRootNav(nav);
 
       spyOn(plt, 'exitApp');
       spyOn(nav, 'pop');
       spyOn(portal, 'pop');
 
-      let view1 = mockView();
+      const view1 = mockView();
       mockViews(nav, [view1]);
 
-      expect(app.getActiveNav()).toBe(nav);
+      expect(app.getActiveNavs(nav.id)[0]).toBe(nav);
       expect(nav.first()).toBe(view1);
 
       app.goBack();
@@ -213,8 +221,8 @@ describe('App', () => {
     });
 
     it('should not exit app when only one view in the root nav, but navExitApp config set', () => {
-      let nav = mockNavController();
-      app._setRootNav(nav);
+      const nav = mockNavController();
+      app.registerRootNav(nav);
 
       spyOn(plt, 'exitApp');
       spyOn(nav, 'pop');
@@ -222,10 +230,10 @@ describe('App', () => {
 
       config.set('navExitApp', false);
 
-      let view1 = mockView();
+      const view1 = mockView();
       mockViews(nav, [view1]);
 
-      expect(app.getActiveNav()).toBe(nav);
+      expect(app.getActiveNavs(nav.id)[0]).toBe(nav);
       expect(nav.first()).toBe(view1);
 
       app.goBack();
@@ -236,14 +244,14 @@ describe('App', () => {
     });
 
     it('should not go back if app is not enabled', () => {
-      let nav = mockNavController();
-      app._setRootNav(nav);
+      const nav = mockNavController();
+      app.registerRootNav(nav);
 
       spyOn(plt, 'exitApp');
       spyOn(nav, 'pop');
       spyOn(portal, 'pop');
 
-      let view1 = mockView();
+      const view1 = mockView();
       mockViews(nav, [view1]);
 
       app.setEnabled(false, 10000);
@@ -263,38 +271,273 @@ describe('App', () => {
       expect(plt.exitApp).not.toHaveBeenCalled();
     });
 
+    it('should first pop the from the nav controller with the most recent view, then pop subsequent views, and eventually exit the app when there isnt anything left to pop', () => {
+      const nav = mockNavController();
+      app.registerRootNav(nav);
+
+      const navTwo = mockNavController();
+      app.registerRootNav(navTwo);
+
+      spyOn(plt, 'exitApp');
+      spyOn(nav, 'pop').and.returnValue(Promise.resolve());
+      spyOn(navTwo, 'pop').and.returnValue(Promise.resolve());
+      spyOn(portal, 'pop');
+
+      const view1 = mockView();
+      const view2 = mockView();
+      mockViews(nav, [view1, view2]);
+
+      const view3 = mockView();
+      view3._ts = view3._ts + 1000;
+      const view4 = mockView();
+      view4._ts = view4._ts + 1000;
+      mockViews(navTwo, [view3, view4]);
+
+      app.goBack();
+
+      mockViews(navTwo, [view3]);
+
+      expect(portal.pop).not.toHaveBeenCalled();
+      expect(nav.pop).not.toHaveBeenCalled();
+      expect(navTwo.pop).toHaveBeenCalled();
+      expect(plt.exitApp).not.toHaveBeenCalled();
+
+      app.goBack();
+      expect(nav.pop).toHaveBeenCalled();
+
+      mockViews(nav, [view1]);
+
+      app.goBack();
+      expect(plt.exitApp).toHaveBeenCalled();
+    });
   });
 
-  describe('getActiveNav', () => {
+  describe('getActiveNavs', () => {
 
     it('should get active NavController when using tabs with nested nav', () => {
-      let nav = mockNavController();
-      app._setRootNav(nav);
+      const nav = mockNavController();
+      app.registerRootNav(nav);
 
-      let tabs = mockTabs();
-      let tab1 = mockTab(tabs);
-      let tab2 = mockTab(tabs);
+      const tabs = mockTabs();
+      const tab1 = mockTab(tabs);
+      const tab2 = mockTab(tabs);
       nav.registerChildNav(tabs);
 
       tab2.setSelected(true);
-      let nav2 = mockNavController();
-      let nav3 = mockNavController();
-      let nav4 = mockNavController();
+      const nav2 = mockNavController();
+      nav2.name = 'nav2';
+      const nav3 = mockNavController();
+      nav3.name = 'nav3';
+      const nav4 = mockNavController();
+      nav4.name = 'nav4';
+
       tab1.registerChildNav(nav4);
+      // tab 2 registers two child navs!!
       tab2.registerChildNav(nav2);
       tab2.registerChildNav(nav3);
 
-      expect(app.getActiveNav()).toBe(nav3);
+      const activeNavs = app.getActiveNavs(nav.id);
+      expect(activeNavs.length).toEqual(2);
+      expect(activeNavs[0]).toEqual(nav2);
+      expect(activeNavs[1]).toEqual(nav3);
+
+      const activeNavsTwo = app.getActiveNavs();
+      expect(activeNavsTwo.length).toEqual(2);
+      expect(activeNavsTwo[0]).toEqual(nav2);
+      expect(activeNavsTwo[1]).toEqual(nav3);
     });
 
     it('should get active NavController when using tabs, nested in a root nav', () => {
-      let nav = mockNavController();
-      app._setRootNav(nav);
+      const nav = mockNavController();
+      app.registerRootNav(nav);
 
-      let tabs = mockTabs();
+      const tabs = mockTabs();
       mockTab(tabs);
-      let tab2 = mockTab(tabs);
-      let tab3 = mockTab(tabs);
+      const tab2 = mockTab(tabs);
+      const tab3 = mockTab(tabs);
+      nav.registerChildNav(tabs);
+
+      tab2.setSelected(true);
+
+      expect(app.getActiveNavs(nav.id)[0]).toBe(tab2);
+      expect(app.getActiveNavs()[0]).toBe(tab2);
+
+      tab2.setSelected(false);
+      tab3.setSelected(true);
+      expect(app.getActiveNavs(nav.id)[0]).toBe(tab3);
+      expect(app.getActiveNavs()[0]).toBe(tab3);
+    });
+
+    it('should get active tab NavController when using tabs, and tabs is the root', () => {
+      const tabs = mockTabs();
+      mockTab(tabs);
+      const tab2 = mockTab(tabs);
+      const tab3 = mockTab(tabs);
+      app.registerRootNav(tabs);
+
+      tab2.setSelected(true);
+
+      expect(app.getActiveNavs(tabs.id)[0]).toBe(tab2);
+      expect(app.getActiveNavs()[0]).toBe(tab2);
+
+      tab2.setSelected(false);
+      tab3.setSelected(true);
+      expect(app.getActiveNavs(tabs.id)[0]).toBe(tab3);
+      expect(app.getActiveNavs()[0]).toBe(tab3);
+    });
+
+    it('should get active NavController when nested 3 deep', () => {
+      const nav1 = mockNavController();
+      const nav2 = mockNavController();
+      const nav3 = mockNavController();
+      app.registerRootNav(nav1);
+
+      nav1.registerChildNav(nav2);
+      nav2.registerChildNav(nav3);
+
+      expect(app.getActiveNavs(nav1.id)[0]).toBe(nav3);
+      expect(app.getActiveNavs()[0]).toBe(nav3);
+      expect(app.getActiveNavs().length).toBe(1);
+    });
+
+    it('should get active NavController when nested 2 deep', () => {
+      const nav1 = mockNavController();
+      const nav2 = mockNavController();
+      app.registerRootNav(nav1);
+
+      nav1.registerChildNav(nav2);
+
+      const activeNav = app.getActiveNavs(nav1.id)[0];
+
+      expect(activeNav).toBe(nav2);
+
+      expect(app.getActiveNavs()[0]).toBe(nav2);
+    });
+
+    it('should get active NavController when only one nav controller', () => {
+      const nav = mockNavController();
+      app.registerRootNav(nav);
+      expect(app.getActiveNavs(nav.id)[0]).toBe(nav);
+      expect(app.getActiveNavs()[0]).toBe(nav);
+    });
+
+    it('should set/get the root nav controller', () => {
+      const nav = mockNavController();
+      app.registerRootNav(nav);
+      expect(app.getRootNavById(nav.id)).toBe(nav);
+    });
+
+    it('should not get an active NavController if there is not root set', () => {
+      const activeNavs = app.getActiveNavs();
+      const rootNav = app.getRootNavById('');
+      expect(activeNavs.length).toEqual(0);
+      expect(rootNav).toBeFalsy();
+    });
+
+    it('should just work when there are multiple active navs', () => {
+      const rootNavOne = mockNavController();
+      const rootNavTwo = mockNavController();
+
+      app.registerRootNav(rootNavOne);
+      app.registerRootNav(rootNavTwo);
+
+      const childNavOne = mockNavController();
+      const childNavTwo = mockNavController();
+
+      rootNavOne.registerChildNav(childNavOne);
+      rootNavTwo.registerChildNav(childNavTwo);
+
+      const activeNavOne = app.getActiveNavs(rootNavOne.id)[0];
+      const activeNavTwo = app.getActiveNavs(rootNavTwo.id)[0];
+
+      expect(activeNavOne).toBe(childNavOne);
+      expect(activeNavTwo).toBe(childNavTwo);
+
+      expect(app.getActiveNavs()[0]).toBe(childNavOne);
+      expect(app.getActiveNavs()[1]).toBe(childNavTwo);
+    });
+
+    it('should get the active nav when no id is provided assuming there is one nav', () => {
+      const rootNavOne = mockNavController();
+      app.registerRootNav(rootNavOne);
+
+      const childNavOne = mockNavController();
+      rootNavOne.registerChildNav(childNavOne);
+
+      const result = app.getActiveNavs()[0];
+
+      expect(result).toEqual(childNavOne);
+    });
+
+    it('should return the all the active navs when there is not an id passed', () => {
+      const rootNavOne = mockNavController();
+      app.registerRootNav(rootNavOne);
+
+      const rootNavTwo = mockNavController();
+      app.registerRootNav(rootNavTwo);
+
+      const childNavOne = mockNavController();
+      rootNavOne.registerChildNav(childNavOne);
+
+      const childChildNavOne = mockNavController();
+      childNavOne.registerChildNav(childChildNavOne);
+
+      const childNavTwo = mockNavController();
+      rootNavTwo.registerChildNav(childNavTwo);
+
+      const childChildNavTwo = mockNavController();
+      childNavTwo.registerChildNav(childChildNavTwo);
+
+      const results = app.getActiveNavs();
+      expect(results.length).toEqual(2);
+      expect(results[0]).toEqual(childChildNavOne);
+      expect(results[1]).toEqual(childChildNavTwo);
+
+      const withIdResultsOne = app.getActiveNavs(rootNavOne.id);
+      expect(withIdResultsOne.length).toEqual(1);
+      expect(withIdResultsOne[0]).toEqual(childChildNavOne);
+
+      const withIdResultsTwo = app.getActiveNavs(rootNavTwo.id);
+      expect(withIdResultsTwo.length).toEqual(1);
+      expect(withIdResultsTwo[0]).toEqual(childChildNavTwo);
+    });
+  });
+
+  describe('getActiveNav', () => {
+    it('should get active NavController when using tabs with nested nav', () => {
+      const nav = mockNavController();
+      app.registerRootNav(nav);
+
+      const tabs = mockTabs();
+      const tab1 = mockTab(tabs);
+      const tab2 = mockTab(tabs);
+      nav.registerChildNav(tabs);
+
+      tab2.setSelected(true);
+      const nav2 = mockNavController();
+      nav2.name = 'nav2';
+      const nav3 = mockNavController();
+      nav3.name = 'nav3';
+      const nav4 = mockNavController();
+      nav4.name = 'nav4';
+
+      tab1.registerChildNav(nav4);
+      // tab 2 registers two child navs!!
+      tab2.registerChildNav(nav2);
+      tab2.registerChildNav(nav3);
+
+      const activeNav = app.getActiveNav();
+      expect(activeNav).toEqual(nav2);
+    });
+
+    it('should get active NavController when using tabs, nested in a root nav', () => {
+      const nav = mockNavController();
+      app.registerRootNav(nav);
+
+      const tabs = mockTabs();
+      mockTab(tabs);
+      const tab2 = mockTab(tabs);
+      const tab3 = mockTab(tabs);
       nav.registerChildNav(tabs);
 
       tab2.setSelected(true);
@@ -307,11 +550,11 @@ describe('App', () => {
     });
 
     it('should get active tab NavController when using tabs, and tabs is the root', () => {
-      let tabs = mockTabs();
+      const tabs = mockTabs();
       mockTab(tabs);
-      let tab2 = mockTab(tabs);
-      let tab3 = mockTab(tabs);
-      app._setRootNav(tabs);
+      const tab2 = mockTab(tabs);
+      const tab3 = mockTab(tabs);
+      app.registerRootNav(tabs);
 
       tab2.setSelected(true);
 
@@ -323,10 +566,10 @@ describe('App', () => {
     });
 
     it('should get active NavController when nested 3 deep', () => {
-      let nav1 = mockNavController();
-      let nav2 = mockNavController();
-      let nav3 = mockNavController();
-      app._setRootNav(nav1);
+      const nav1 = mockNavController();
+      const nav2 = mockNavController();
+      const nav3 = mockNavController();
+      app.registerRootNav(nav1);
 
       nav1.registerChildNav(nav2);
       nav2.registerChildNav(nav3);
@@ -335,29 +578,87 @@ describe('App', () => {
     });
 
     it('should get active NavController when nested 2 deep', () => {
-      let nav1 = mockNavController();
-      let nav2 = mockNavController();
-      app._setRootNav(nav1);
+      const nav1 = mockNavController();
+      const nav2 = mockNavController();
+      app.registerRootNav(nav1);
 
       nav1.registerChildNav(nav2);
-      expect(app.getActiveNav()).toBe(nav2);
+
+      const activeNav = app.getActiveNav();
+
+      expect(activeNav).toBe(nav2);
     });
 
     it('should get active NavController when only one nav controller', () => {
-      let nav = mockNavController();
-      app._setRootNav(nav);
+      const nav = mockNavController();
+      app.registerRootNav(nav);
       expect(app.getActiveNav()).toBe(nav);
     });
 
-    it('should set/get the root nav controller', () => {
-      let nav = mockNavController();
-      app._setRootNav(nav);
-      expect(app.getRootNav()).toBe(nav);
+    it('should not get an active NavController if there is not root set', () => {
+      const activeNav = app.getActiveNav();
+      expect(activeNav).toBeFalsy();
     });
 
-    it('should not get an active NavController if there is not root set', () => {
-      expect(app.getActiveNav()).toBeNull();
-      expect(app.getRootNav()).toBeNull();
+    it('should just work when there are multiple active navs', () => {
+      const rootNavOne = mockNavController();
+      const rootNavTwo = mockNavController();
+
+      app.registerRootNav(rootNavOne);
+      app.registerRootNav(rootNavTwo);
+
+      const childNavOne = mockNavController();
+      const childNavTwo = mockNavController();
+
+      rootNavOne.registerChildNav(childNavOne);
+      rootNavTwo.registerChildNav(childNavTwo);
+
+      const activeNavOne = app.getActiveNav();
+
+      expect(activeNavOne).toBe(childNavOne);
+    });
+
+    it('should get the active nav when no id is provided assuming there is one nav', () => {
+      const rootNavOne = mockNavController();
+      app.registerRootNav(rootNavOne);
+
+      const childNavOne = mockNavController();
+      rootNavOne.registerChildNav(childNavOne);
+
+      const result = app.getActiveNav();
+
+      expect(result).toEqual(childNavOne);
+    });
+  });
+
+  describe('getRootNavs', () => {
+    it('should return an array of navs', () => {
+      const rootNavOne = mockNavController();
+      app.registerRootNav(rootNavOne);
+      const rootNavTwo = mockNavController();
+      app.registerRootNav(rootNavTwo);
+
+      const results = app.getRootNavs();
+      expect(results.length).toEqual(2);
+    });
+  });
+
+  describe('getRootNav', () => {
+    it('should return the single root nav', () => {
+      const rootNavOne = mockNavController();
+      app.registerRootNav(rootNavOne);
+      const result = app.getRootNav();
+      expect(result).toEqual(rootNavOne);
+    });
+
+    it('should return the first nav in the list for backwards compatibility', () => {
+      const rootNavOne = mockNavController();
+      app.registerRootNav(rootNavOne);
+      const rootNavTwo = mockNavController();
+      app.registerRootNav(rootNavTwo);
+
+      const result = app.getRootNav();
+      expect(result).toEqual(rootNavOne);
     });
   });
 
@@ -381,7 +682,7 @@ describe('App', () => {
 
     it('should enable click block when false is passed with duration', () => {
       // arrange
-      let mockClickBlock: any = {
+      const mockClickBlock: any = {
         activate: () => {}
       };
 
@@ -398,7 +699,7 @@ describe('App', () => {
 
     it('should enable click block when false is passed w/o duration', () => {
       // arrange
-      let mockClickBlock: any = {
+      const mockClickBlock: any = {
         activate: () => {}
       };
 
@@ -416,7 +717,7 @@ describe('App', () => {
 
     it('should enable click block when false is passed with a duration of 0 and with a minDuration', () => {
       // arrange
-      let mockClickBlock: any = {
+      const mockClickBlock: any = {
         activate: () => {}
       };
 
@@ -433,7 +734,7 @@ describe('App', () => {
 
     it('should enable click block when false is passed with a null duration and a minDuration', () => {
       // arrange
-      let mockClickBlock: any = {
+      const mockClickBlock: any = {
         activate: () => {}
       };
 
@@ -450,7 +751,7 @@ describe('App', () => {
 
     it('should enable click block when false is passed with a duration and a minDuration', () => {
       // arrange
-      let mockClickBlock: any = {
+      const mockClickBlock: any = {
         activate: () => {}
       };
 
@@ -466,10 +767,153 @@ describe('App', () => {
     });
   });
 
-  var app: App;
-  var config: Config;
-  var plt: MockPlatform;
-  var portal: OverlayPortal;
+  describe('getNavByIdOrName', () => {
+    it('should return a basic root nav', () => {
+      const nav = mockNavController();
+      app.registerRootNav(nav);
+      const result = app.getNavByIdOrName(nav.id);
+      expect(result).toEqual(nav);
+    });
+
+    it('should return a child nav', () => {
+      const rootNav = mockNavController();
+      app.registerRootNav(rootNav);
+
+      const childNav = mockNavController();
+      childNav.parent = rootNav;
+      rootNav.registerChildNav(childNav);
+
+      const childChildNav = mockNavController();
+      childChildNav.parent = childNav;
+      childNav.registerChildNav(childChildNav);
+
+
+      const expectedChildNav = app.getNavByIdOrName(childNav.id);
+      expect(expectedChildNav).toEqual(childNav);
+
+      const expectedChildChildNav = app.getNavByIdOrName(childChildNav.id);
+      expect(expectedChildChildNav).toEqual(childChildNav);
+    });
+
+    it('should return a child nav when there is a tabs in there', () => {
+      const rootNav = mockNavController();
+      app.registerRootNav(rootNav);
+
+      const tabs = mockTabs();
+      tabs.parent = rootNav;
+      rootNav.registerChildNav(tabs);
+
+      const tab1 = mockTab(tabs);
+      const tab2 = mockTab(tabs);
+      const tab3 = mockTab(tabs);
+
+      const tabChildNav = mockNavController();
+      tabChildNav.parent = tab2;
+      tab2.registerChildNav(tabChildNav);
+
+      const tabChildChildNav = mockNavController();
+      tabChildChildNav.parent = tabChildNav;
+      tabChildNav.registerChildNav(tabChildChildNav);
+
+      const expectedTab1 = app.getNavByIdOrName(tab1.id);
+      expect(expectedTab1).toEqual(tab1);
+
+      const expectedTab2 = app.getNavByIdOrName(tab2.id);
+      expect(expectedTab2).toEqual(tab2);
+
+      const expectedTab3 = app.getNavByIdOrName(tab3.id);
+      expect(expectedTab3).toEqual(tab3);
+
+      const expectedTabChildNav = app.getNavByIdOrName(tabChildNav.id);
+      expect(expectedTabChildNav).toEqual(tabChildNav);
+
+      const expectedTabChildChildNav = app.getNavByIdOrName(tabChildChildNav.id);
+      expect(expectedTabChildChildNav).toEqual(tabChildChildNav);
+    });
+
+    it('should return a basic root nav when the are multiple root navs', () => {
+      const rootNavOne = mockNavController();
+      const rootNavTwo = mockNavController();
+      const rootNavThree = mockNavController();
+      app.registerRootNav(rootNavOne);
+      app.registerRootNav(rootNavTwo);
+      app.registerRootNav(rootNavThree);
+
+      const expectedRootNavOne = app.getNavByIdOrName(rootNavOne.id);
+      expect(expectedRootNavOne).toEqual(rootNavOne);
+
+      const expectedRootNavTwo = app.getNavByIdOrName(rootNavTwo.id);
+      expect(expectedRootNavTwo).toEqual(rootNavTwo);
+
+      const expectedRootNavThree = app.getNavByIdOrName(rootNavThree.id);
+      expect(expectedRootNavThree).toEqual(rootNavThree);
+    });
+
+    it('should return a proper navs when there are multiple root navs with nested navs', () => {
+      const rootNavOne = mockNavController();
+      const rootNavTwo = mockNavController();
+      const rootNavThree = mockNavController();
+      app.registerRootNav(rootNavOne);
+      app.registerRootNav(rootNavTwo);
+      app.registerRootNav(rootNavThree);
+
+      const childNavOne = mockNavController();
+      childNavOne.parent = rootNavOne;
+      rootNavOne.registerChildNav(childNavOne);
+
+      const childChildNavOne = mockNavController();
+      childChildNavOne.parent = childNavOne;
+      childNavOne.registerChildNav(childChildNavOne);
+
+      const childNavTwo = mockNavController();
+      childNavOne.parent = rootNavTwo;
+      rootNavTwo.registerChildNav(childNavTwo);
+
+      const childChildNavTwo = mockNavController();
+      childChildNavTwo.parent = childNavTwo;
+      childNavTwo.registerChildNav(childChildNavTwo);
+
+      const childNavThree = mockNavController();
+      childNavThree.parent = rootNavThree;
+      rootNavThree.registerChildNav(childNavThree);
+
+      const childChildNavThree = mockNavController();
+      childChildNavThree.parent = childNavThree;
+      childNavThree.registerChildNav(childChildNavThree);
+
+      const expectedRootNavOne = app.getNavByIdOrName(rootNavOne.id);
+      expect(expectedRootNavOne).toEqual(rootNavOne);
+
+      const expectedChildNavOne = app.getNavByIdOrName(childNavOne.id);
+      expect(expectedChildNavOne).toEqual(childNavOne);
+
+      const expectedChildChildNavOne = app.getNavByIdOrName(childChildNavOne.id);
+      expect(expectedChildChildNavOne).toEqual(childChildNavOne);
+
+      const expectedRootNavTwo = app.getNavByIdOrName(rootNavTwo.id);
+      expect(expectedRootNavTwo).toEqual(rootNavTwo);
+
+      const expectedChildNavTwo = app.getNavByIdOrName(childNavTwo.id);
+      expect(expectedChildNavTwo).toEqual(childNavTwo);
+
+      const expectedChildChildNavTwo = app.getNavByIdOrName(childChildNavTwo.id);
+      expect(expectedChildChildNavTwo).toEqual(childChildNavTwo);
+
+      const expectedRootNavThree = app.getNavByIdOrName(rootNavThree.id);
+      expect(expectedRootNavThree).toEqual(rootNavThree);
+
+      const expectedChildNavThree = app.getNavByIdOrName(childNavThree.id);
+      expect(expectedChildNavThree).toEqual(childNavThree);
+
+      const expectedChildChildNavThree = app.getNavByIdOrName(childChildNavThree.id);
+      expect(expectedChildChildNavThree).toEqual(childChildNavThree);
+    });
+  });
+
+  let app: App;
+  let config: Config;
+  let plt: MockPlatform;
+  let portal: OverlayPortal;
 
   beforeEach(() => {
     config = mockConfig();
diff --git a/src/components/button/button.md.scss b/src/components/button/button.md.scss
index dc4ca05fc51..20227c74252 100644
--- a/src/components/button/button.md.scss
+++ b/src/components/button/button.md.scss
@@ -492,7 +492,7 @@ $button-md-strong-font-weight:                  bold !default;
   }
 }
 
-.md .button-effect {
+.md button .button-effect {
   display: block;
 }
 
diff --git a/src/components/checkbox/checkbox.ts b/src/components/checkbox/checkbox.ts
index d8aa685e2f3..be8fcc18c2e 100644
--- a/src/components/checkbox/checkbox.ts
+++ b/src/components/checkbox/checkbox.ts
@@ -118,13 +118,6 @@ export class Checkbox extends BaseInput<boolean> implements IonicTapInput, OnDes
     super(config, elementRef, renderer, 'checkbox', false, form, item, null);
   }
 
-  /**
-   * @hidden
-   */
-  initFocus() {
-    this._elementRef.nativeElement.querySelector('button').focus();
-  }
-
   /**
    * @hidden
    */
@@ -145,8 +138,8 @@ export class Checkbox extends BaseInput<boolean> implements IonicTapInput, OnDes
   /**
    * @hidden
    */
-  _inputCheckHasValue(val: boolean) {
-    this._item && this._item.setElementClass('item-checkbox-checked', val);
+  _inputUpdated() {
+    this._item && this._item.setElementClass('item-checkbox-checked', this._value);
   }
 
 }
diff --git a/src/components/checkbox/test/checkbox.spec.ts b/src/components/checkbox/test/checkbox.spec.ts
index 4c957b230af..0207f2a2313 100644
--- a/src/components/checkbox/test/checkbox.spec.ts
+++ b/src/components/checkbox/test/checkbox.spec.ts
@@ -1,7 +1,7 @@
 
 import { Checkbox } from '../checkbox';
-import { mockConfig, mockElementRef, mockRenderer, mockItem } from '../../../util/mock-providers';
-import { commonInputTest, BOOLEAN_CORPUS } from '../../../util/input-tester';
+import { mockConfig, mockElementRef, mockItem, mockRenderer } from '../../../util/mock-providers';
+import { BOOLEAN_CORPUS, commonInputTest } from '../../../util/input-tester';
 
 describe('Checkbox', () => {
 
diff --git a/src/components/content/content.ts b/src/components/content/content.ts
index e579123e09e..ee2e15648b0 100644
--- a/src/components/content/content.ts
+++ b/src/components/content/content.ts
@@ -6,12 +6,12 @@ import { DomController } from '../../platform/dom-controller';
 import { Img } from '../img/img-interface';
 import { Ion } from '../ion';
 import { isTabs } from '../../navigation/nav-util';
-import { isTrueProperty, assert, removeArrayItem } from '../../util/util';
+import { assert, isTrueProperty, removeArrayItem } from '../../util/util';
 import { Keyboard } from '../../platform/keyboard';
 import { NavController } from '../../navigation/nav-controller';
 import { Content as IContent, Tabs } from '../../navigation/nav-interfaces';
 import { Platform } from '../../platform/platform';
-import { ScrollView, ScrollEvent } from '../../util/scroll-view';
+import { ScrollEvent, ScrollView } from '../../util/scroll-view';
 import { ViewController } from '../../navigation/view-controller';
 
 export { ScrollEvent } from '../../util/scroll-view';
@@ -63,7 +63,7 @@ export class EventEmitterProxy<T> extends EventEmitter<T> {
  *
  * @advanced
  *
- * ### Sroll Events
+ * ### Scroll Events
  *
  * Scroll events happen outside of Angular's Zones. This is for performance reasons. So
  * if you're trying to bind a value to any scroll event, it will need to be wrapped in
@@ -167,7 +167,8 @@ export class EventEmitterProxy<T> extends EventEmitter<T> {
     '</div>' +
     '<ng-content select="ion-refresher"></ng-content>',
   host: {
-    '[class.statusbar-padding]': 'statusbarPadding'
+    '[class.statusbar-padding]': 'statusbarPadding',
+    '[class.has-refresher]': '_hasRefresher'
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None
@@ -212,6 +213,8 @@ export class Content extends Ion implements OnDestroy, AfterViewInit, IContent {
   /** @internal */
   _fullscreen: boolean;
   /** @internal */
+  _hasRefresher: boolean = false;
+  /** @internal */
   _footerEle: HTMLElement;
   /** @internal */
   _dirty: boolean;
@@ -782,6 +785,11 @@ export class Content extends Ion implements OnDestroy, AfterViewInit, IContent {
       this._cBottom += this._tabbarHeight;
     }
 
+    // Refresher uses a border which should be hidden unless pulled
+    if (this._hasRefresher) {
+      this._cTop -= 1;
+    }
+
     // Fixed content shouldn't include content padding
     this._fTop = this._cTop;
     this._fBottom = this._cBottom;
diff --git a/src/components/datetime/datetime.ts b/src/components/datetime/datetime.ts
index 27cf3a3b2cf..1adce76ee02 100644
--- a/src/components/datetime/datetime.ts
+++ b/src/components/datetime/datetime.ts
@@ -8,8 +8,23 @@ import { PickerColumn } from '../picker/picker-options';
 import { Form } from '../../util/form';
 import { BaseInput } from '../../util/base-input';
 import { Item } from '../item/item';
-import { deepCopy, isBlank, isPresent, isArray, isObject, isString, assert, clamp } from '../../util/util';
-import { dateValueRange, renderDateTime, renderTextFormat, convertDataToISO, convertFormatToKey, getValueFromFormat, parseTemplate, parseDate, updateDate, DateTimeData, daysInMonth, dateSortValue, dateDataSortValue, LocaleData } from '../../util/datetime-util';
+import { assert, clamp, deepCopy, isArray, isBlank, isObject, isPresent, isString } from '../../util/util';
+import {
+  DateTimeData,
+  LocaleData,
+  convertDataToISO,
+  convertFormatToKey,
+  dateDataSortValue,
+  dateSortValue,
+  dateValueRange,
+  daysInMonth,
+  getValueFromFormat,
+  parseDate,
+  parseTemplate,
+  renderDateTime,
+  renderTextFormat,
+  updateDate,
+} from '../../util/datetime-util';
 
 /**
  * @name DateTime
@@ -448,6 +463,7 @@ export class DateTime extends BaseInput<DateTimeData> implements AfterContentIni
    * @hidden
    */
   _inputUpdated() {
+    super._inputUpdated();
     this.updateText();
   }
 
@@ -475,10 +491,6 @@ export class DateTime extends BaseInput<DateTimeData> implements AfterContentIni
 
   @HostListener('click', ['$event'])
   _click(ev: UIEvent) {
-    // do not continue if the click event came from a form submit
-    if (ev.detail === 0) {
-      return;
-    }
     ev.preventDefault();
     ev.stopPropagation();
     this.open();
diff --git a/src/components/datetime/test/datetime.spec.ts b/src/components/datetime/test/datetime.spec.ts
index 235ed4b7ebc..5b407654f7b 100644
--- a/src/components/datetime/test/datetime.spec.ts
+++ b/src/components/datetime/test/datetime.spec.ts
@@ -90,7 +90,7 @@ describe('DateTime', () => {
       columns[0].selectedIndex = 1; // February
       datetime.validate();
 
-      for (var i = 0; i < 28; i++) {
+      for (let i = 0; i < 28; i++) {
         expect(columns[1].options[i].disabled).toEqual(false);
       }
       expect(columns[1].options[28].disabled).toEqual(true);
@@ -100,7 +100,7 @@ describe('DateTime', () => {
       columns[0].selectedIndex = 3; // April
       datetime.validate();
 
-      for (var i = 0; i < 30; i++) {
+      for (let i = 0; i < 30; i++) {
         expect(columns[1].options[i].disabled).toEqual(false);
       }
       expect(columns[1].options[30].disabled).toEqual(true);
@@ -130,7 +130,7 @@ describe('DateTime', () => {
       }
 
       // // Days
-      for (var i = 0; i < columns[1].options.length; i++) {
+      for (let i = 0; i < columns[1].options.length; i++) {
         expect(columns[1].options[i].disabled).toEqual(false);
       }
 
diff --git a/src/components/fab/fab-list.ts b/src/components/fab/fab-list.ts
index f5b9c5bbb1a..d5cfbfffdbd 100644
--- a/src/components/fab/fab-list.ts
+++ b/src/components/fab/fab-list.ts
@@ -1,4 +1,4 @@
-import { ContentChildren, QueryList, Directive, ElementRef, Renderer } from '@angular/core';
+import { ContentChildren, Directive, ElementRef, QueryList, Renderer } from '@angular/core';
 
 import { Config } from '../../config/config';
 import { isTrueProperty } from '../../util/util';
diff --git a/src/components/fab/fab.ts b/src/components/fab/fab.ts
index 2e6ba65fcee..e6129969bbd 100755
--- a/src/components/fab/fab.ts
+++ b/src/components/fab/fab.ts
@@ -1,4 +1,4 @@
-import { Component, ChangeDetectionStrategy, ElementRef, Renderer, ViewEncapsulation } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Renderer, ViewEncapsulation } from '@angular/core';
 
 import { Config } from '../../config/config';
 import { Ion } from '../ion';
diff --git a/src/components/img/img-interface.ts b/src/components/img/img-interface.ts
index 6d46381dfc0..33fe81a445f 100644
--- a/src/components/img/img-interface.ts
+++ b/src/components/img/img-interface.ts
@@ -6,4 +6,4 @@ export interface Img {
   canRequest: boolean;
   reset(): void;
   update(): void;
-};
+}
diff --git a/src/components/infinite-scroll/infinite-scroll.ts b/src/components/infinite-scroll/infinite-scroll.ts
index 722afec62b8..d8c056d4670 100644
--- a/src/components/infinite-scroll/infinite-scroll.ts
+++ b/src/components/infinite-scroll/infinite-scroll.ts
@@ -1,6 +1,6 @@
-import { Directive, ElementRef, EventEmitter, Input, NgZone, Output } from '@angular/core';
+import { Directive, ElementRef, EventEmitter, Input, NgZone, Output, Renderer } from '@angular/core';
 
-import { Content, ScrollEvent } from '../content/content';
+import { Content, ContentDimensions, ScrollEvent } from '../content/content';
 import { DomController } from '../../platform/dom-controller';
 import { assert } from '../../util/util';
 
@@ -150,6 +150,7 @@ export class InfiniteScroll {
   _thrPc: number = 0.15;
   _position: string = POSITION_BOTTOM;
   _init: boolean = false;
+  _prevDim: ContentDimensions;
 
 
   /**
@@ -222,7 +223,8 @@ export class InfiniteScroll {
     private _content: Content,
     private _zone: NgZone,
     private _elementRef: ElementRef,
-    private _dom: DomController
+    private _dom: DomController,
+    private _renderer: Renderer
   ) {
     _content.setElementClass('has-infinite-scroll', true);
   }
@@ -246,9 +248,8 @@ export class InfiniteScroll {
     }
 
     // ******** DOM READ ****************
-    const d = this._content.getContentDimensions();
+    const d = this._content.getContentDimensions()
     const height = d.contentHeight;
-
     const threshold = this._thrPc ? (height * this._thrPc) : this._thrPx;
 
     // ******** DOM READS ABOVE / DOM WRITES BELOW ****************
@@ -267,6 +268,7 @@ export class InfiniteScroll {
       this._dom.write(() => {
         this._zone.run(() => {
           if (this.state !== STATE_LOADING && this.state !== STATE_DISABLED) {
+            this._prevDim = d;
             this.state = STATE_LOADING;
             this.ionInfinite.emit(this);
           }
@@ -299,45 +301,33 @@ export class InfiniteScroll {
     }
 
     assert(this._position === POSITION_TOP, 'position should be top');
-    /* New content is being added at the top, but the scrollTop position stays the same,
-      which causes a scroll jump visually. This algorithm makes sure to prevent this.
-
-      (Frame 1)
-        complete() is called, but the UI hasn't had time to update yet.
-        Save the current content dimensions.
-        Wait for the next frame using _dom.read, so the UI will be updated.
-
-      (Frame 2)
-        Read the new content dimensions.
-        Calculate the height difference and the new scroll position.
-        Delay the scroll position change until other possible dom reads are done using _dom.write to be performant.
-
-      (Still frame 2, if I'm correct)
-        Change the scroll position (= visually maintain the scroll position).
-        Change the state to re-enable the InfiniteScroll. This should be after changing the scroll position, or it could cause the InfiniteScroll to be triggered again immediately.
-
-      (Frame 3)
-        Done.
-    */
-
-    // ******** DOM READ ****************
-    // Save the current content dimensions before the UI updates
-    const prevDim = this._content.getContentDimensions();
+    this._updateScrollTopPosition();
+  }
 
+  /**
+   * @hidden
+   *
+   * Updates `scrollTop` position of `Content with respect to the last received `ScrollEvent`
+   */
+  _updateScrollTopPosition() {
     // ******** DOM READ ****************
     this._dom.read(() => {
-      // UI has updated, save the new content dimensions
+      const scrollEl = this._content.getScrollElement();
       const newDim = this._content.getContentDimensions();
-
-      // New content was added on top, so the scroll position should be changed immediately to prevent it from jumping around
-      const newScrollTop = newDim.scrollHeight - (prevDim.scrollHeight - prevDim.scrollTop);
+      const scrollTop = this._prevDim.scrollTop < 0 ? 0 : this._prevDim.scrollTop;
+      const newScrollTop = scrollTop + newDim.scrollHeight - this._prevDim.scrollHeight;
 
       // ******** DOM WRITE ****************
       this._dom.write(() => {
+        this._renderer.setElementStyle(scrollEl, '-webkit-overflow-scrolling', 'auto');
         this._content.scrollTop = newScrollTop;
+      });
+
+      this._dom.write(() => {
+        this._renderer.setElementStyle(scrollEl, '-webkit-overflow-scrolling', '');
         this.state = STATE_ENABLED;
       });
-    });
+    })
   }
 
   /**
diff --git a/src/components/infinite-scroll/test/basic/app.module.ts b/src/components/infinite-scroll/test/basic/app.module.ts
index f4ff1d67211..c037ba2d222 100644
--- a/src/components/infinite-scroll/test/basic/app.module.ts
+++ b/src/components/infinite-scroll/test/basic/app.module.ts
@@ -1,6 +1,6 @@
-import { Component, ViewChild, NgModule } from '@angular/core';
+import { Component, NgModule, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, InfiniteScroll, NavController } from '../../../..';
+import { InfiniteScroll, IonicApp, IonicModule,  NavController } from '../../../..';
 
 
 @Component({
diff --git a/src/components/infinite-scroll/test/infinite-scroll.spec.ts b/src/components/infinite-scroll/test/infinite-scroll.spec.ts
index 4eb4bb49e8f..a659e8c2cb4 100644
--- a/src/components/infinite-scroll/test/infinite-scroll.spec.ts
+++ b/src/components/infinite-scroll/test/infinite-scroll.spec.ts
@@ -18,7 +18,7 @@ describe('Infinite Scroll', () => {
 
       setInfiniteScrollTop(300);
 
-      var result = inf._onScroll(ev);
+      var result = inf._onScroll(Object.assign(ev, content.getContentDimensions()));
       expect(result).toEqual(6);
     });
 
@@ -31,7 +31,7 @@ describe('Infinite Scroll', () => {
 
       setInfiniteScrollTop(300);
 
-      var result = inf._onScroll(ev);
+      var result = inf._onScroll(Object.assign(ev, content.getContentDimensions()));
       expect(result).toEqual(5);
     });
 
@@ -122,18 +122,20 @@ describe('Infinite Scroll', () => {
   let infiniteElementRef: any;
   let ev: ScrollEvent = (<any>{});
   let dom: DomController;
+  let renderer: any;
 
   beforeEach(() => {
     contentElementRef = mockElementRef();
     dom = mockDomController();
-    content = new Content(config, mockPlatform(), dom, contentElementRef, mockRenderer(), null, null, mockZone(), null, null);
+    renderer = mockRenderer();
+    content = new Content(config, mockPlatform(), dom, contentElementRef, renderer, null, null, mockZone(), null, null);
     let ele = document.createElement('div');
     ele.className = 'scroll-content';
     content._scrollContent = mockElementRefEle(ele);
 
     infiniteElementRef = mockElementRef();
 
-    inf = new InfiniteScroll(content, mockZone(), infiniteElementRef, dom);
+    inf = new InfiniteScroll(content, mockZone(), infiniteElementRef, dom, renderer);
   });
 
   function setInfiniteScrollTop(scrollTop: any) {
diff --git a/src/components/infinite-scroll/test/short-list/app.module.ts b/src/components/infinite-scroll/test/short-list/app.module.ts
index df16bac150a..3741a73485b 100644
--- a/src/components/infinite-scroll/test/short-list/app.module.ts
+++ b/src/components/infinite-scroll/test/short-list/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, InfiniteScroll } from '../../../..';
+import { InfiniteScroll, IonicApp, IonicModule } from '../../../..';
 
 
 @Component({
diff --git a/src/components/input/input.scss b/src/components/input/input.scss
index 4576fed2d40..119a87e8333 100644
--- a/src/components/input/input.scss
+++ b/src/components/input/input.scss
@@ -93,6 +93,8 @@ input.text-input:-webkit-autofill {
 
   width: 100%;
   height: 100%;
+
+  touch-action: manipulation;
 }
 
 .input[disabled] .input-cover {
@@ -127,27 +129,6 @@ input.text-input:-webkit-autofill {
 }
 
 
-// Scroll Assist Input
-// --------------------------------------------------
-// This input is used to help the app handle
-// Next and Previous input tabbing
-
-[next-input] {
-  @include padding(0);
-
-  position: absolute;
-  bottom: 20px;
-
-  width: 1px;
-  height: 1px;
-
-  border: 0;
-  background: transparent;
-
-  pointer-events: none;
-}
-
-
 // Clear Input Icon
 // --------------------------------------------------
 
diff --git a/src/components/input/input.ts b/src/components/input/input.ts
index f3f7980d77b..7c02a693204 100644
--- a/src/components/input/input.ts
+++ b/src/components/input/input.ts
@@ -1,19 +1,29 @@
-import { Component, Optional, ElementRef, EventEmitter, Input, Output, Renderer, ViewChild, ViewEncapsulation } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  Optional,
+  Output,
+  Renderer,
+  ViewChild,
+  ViewEncapsulation
+} from '@angular/core';
 import { NgControl } from '@angular/forms';
 
+import { Subject } from 'rxjs/Subject';
+import 'rxjs/add/operator/takeUntil';
+
 import { App } from '../app/app';
 import { Config } from '../../config/config';
-import { Content, ContentDimensions, ScrollEvent } from '../content/content';
-import { copyInputAttributes, PointerCoordinates, hasPointerMoved, pointerCoord }  from '../../util/dom';
+import { Content, ContentDimensions } from '../content/content';
+import { copyInputAttributes, hasPointerMoved, pointerCoord }  from '../../util/dom';
 import { DomController } from '../../platform/dom-controller';
 import { Form, IonicFormInput } from '../../util/form';
-import { Ion } from '../ion';
-import { isString, isTrueProperty } from '../../util/util';
+import { BaseInput } from '../../util/base-input';
+import { assert, isTrueProperty } from '../../util/util';
 import { Item } from '../item/item';
-import { NativeInput } from './native-input';
-import { NextInput } from './next-input';
-import { NavController } from '../../navigation/nav-controller';
-import { NavControllerBase } from '../../navigation/nav-controller-base';
 import { Platform } from '../../platform/platform';
 
 
@@ -84,92 +94,68 @@ import { Platform } from '../../platform/platform';
 @Component({
   selector: 'ion-input,ion-textarea',
   template:
-    '<input [(ngModel)]="_value" [type]="type" (blur)="inputBlurred($event)" (focus)="inputFocused($event)" [placeholder]="placeholder" [disabled]="disabled" [readonly]="readonly" class="text-input" [ngClass]="\'text-input-\' + _mode" *ngIf="_type!==\'textarea\'"  #input>' +
-    '<textarea [(ngModel)]="_value" (blur)="inputBlurred($event)" (focus)="inputFocused($event)" [placeholder]="placeholder" [disabled]="disabled" [readonly]="readonly" class="text-input" [ngClass]="\'text-input-\' + _mode" *ngIf="_type===\'textarea\'" #textarea></textarea>' +
-    '<input [type]="type" aria-hidden="true" next-input *ngIf="_useAssist">' +
-    '<button ion-button clear [hidden]="!clearInput" type="button" class="text-input-clear-icon" (click)="clearTextInput()" (mousedown)="clearTextInput()"></button>' +
-    '<div (touchstart)="pointerStart($event)" (touchend)="pointerEnd($event)" (mousedown)="pointerStart($event)" (mouseup)="pointerEnd($event)" class="input-cover" tappable *ngIf="_useAssist"></div>',
+  '<input #textInput *ngIf="!_isTextarea" class="text-input" ' +
+    '[ngClass]="\'text-input-\' + _mode"' +
+    '(input)="onInput($event)" ' +
+    '(blur)="onBlur($event)" ' +
+    '(focus)="onFocus($event)" ' +
+    '(keydown)="onKeydown($event)" ' +
+    '[type]="_type" ' +
+    '[attr.aria-labelledby]="_labelId" ' +
+    '[attr.min]="min" ' +
+    '[attr.max]="max" ' +
+    '[attr.step]="step" ' +
+    '[attr.autocomplete]="autocomplete" ' +
+    '[attr.autocorrect]="autocorrect" ' +
+    '[placeholder]="placeholder" ' +
+    '[disabled]="_disabled" ' +
+    '[readonly]="_readonly">' +
+
+  '<textarea #textInput *ngIf="_isTextarea" class="text-input" ' +
+    '[ngClass]="\'text-input-\' + _mode"' +
+    '(input)="onInput($event)" ' +
+    '(blur)="onBlur($event)" ' +
+    '(focus)="onFocus($event)" ' +
+    '(keydown)="onKeydown($event)" ' +
+    '[attr.aria-labelledby]="_labelId" ' +
+    '[attr.autocomplete]="autocomplete" ' +
+    '[attr.autocorrect]="autocorrect" ' +
+    '[placeholder]="placeholder" ' +
+    '[disabled]="_disabled" ' +
+    '[readonly]="_readonly"></textarea>' +
+
+  '<button ion-button *ngIf="_clearInput" clear class="text-input-clear-icon" ' +
+    'type="button" ' +
+    '(click)="clearTextInput($event)" ' +
+    '(mousedown)="clearTextInput($event)" ' +
+    'tabindex="-1"></button>' +
+
+  '<div class="input-cover" *ngIf="_useAssist" ' +
+    '(touchstart)="_pointerStart($event)" ' +
+    '(touchend)="_pointerEnd($event)" ' +
+    '(mousedown)="_pointerStart($event)" ' +
+    '(mouseup)="_pointerEnd($event)"></div>',
+
   encapsulation: ViewEncapsulation.None,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  inputs: ['value']
 })
-export class TextInput extends Ion implements IonicFormInput {
-  _autoComplete: string;
-  _autoCorrect: string;
+export class TextInput extends BaseInput<string> implements IonicFormInput {
+
   _autoFocusAssist: string;
   _clearInput: boolean = false;
   _clearOnEdit: boolean;
-  _coord: PointerCoordinates;
   _didBlurAfterEdit: boolean;
-  _disabled: boolean = false;
   _readonly: boolean = false;
-  _isTouch: boolean;
   _keyboardHeight: number;
-  _min: any;
-  _max: any;
-  _step: any;
-  _native: NativeInput;
-  _nav: NavControllerBase;
-  _scrollStart: any;
-  _scrollEnd: any;
   _type: string = 'text';
-  _useAssist: boolean;
-  _usePadding: boolean;
-  _value: any = '';
-
-  /** @hidden */
-  inputControl: NgControl;
-
-  constructor(
-    config: Config,
-    private _plt: Platform,
-    private _form: Form,
-    private _app: App,
-    elementRef: ElementRef,
-    renderer: Renderer,
-    @Optional() private _content: Content,
-    @Optional() private _item: Item,
-    @Optional() nav: NavController,
-    @Optional() public ngControl: NgControl,
-    private _dom: DomController
-  ) {
-    super(config, elementRef, renderer, 'input');
-
-    this._nav = <NavControllerBase>nav;
-
-    this._autoFocusAssist = config.get('autoFocusAssist', 'delay');
-    this._autoComplete = config.get('autocomplete', 'off');
-    this._autoCorrect = config.get('autocorrect', 'off');
-    this._keyboardHeight = config.getNumber('keyboardHeight');
-    this._useAssist = config.getBoolean('scrollAssist', false);
-    this._usePadding = config.getBoolean('scrollPadding', this._useAssist);
-
-    if (elementRef.nativeElement.tagName === 'ION-TEXTAREA') {
-      this._type = TEXTAREA;
-    }
-
-    if (ngControl) {
-      ngControl.valueAccessor = this;
-      this.inputControl = ngControl;
-    }
-
-    _form.register(this);
-
-    // only listen to content scroll events if there is content
-    if (_content) {
-      this._scrollStart = _content.ionScrollStart.subscribe((ev: ScrollEvent) => {
-        this.scrollHideFocus(ev, true);
-      });
-      this._scrollEnd = _content.ionScrollEnd.subscribe((ev: ScrollEvent) => {
-        this.scrollHideFocus(ev, false);
-      });
-    }
-
-    this.mode = config.get('mode');
-  }
-
-  /**
-   * @input {string} Instructional text that shows before the input has a value.
-   */
-  @Input() placeholder: string = '';
+  _scrollData: ScrollData;
+  _isTextarea: boolean = false;
+  _onDestroy = new Subject<void>();
+  _coord: any;
+  _isTouch: boolean;
+  _useAssist = false;
+  _relocated: boolean = false;
 
   /**
    * @input {boolean} If true, a clear icon will appear in the input when there is a value. Clicking it clears the input.
@@ -179,67 +165,21 @@ export class TextInput extends Ion implements IonicFormInput {
     return this._clearInput;
   }
   set clearInput(val: any) {
-    this._clearInput = (this._type !== TEXTAREA && isTrueProperty(val));
-  }
-
-  /**
-   * @input {string} The text value of the input.
-   */
-  @Input()
-  get value() {
-    return this._value;
-  }
-  set value(val: any) {
-    this._value = val;
-    this.checkHasValue(val);
+    this._clearInput = (!this._isTextarea && isTrueProperty(val));
   }
 
   /**
-   * @input {string} The type of control to display. The default type is text. Possible values are: `"text"`, `"password"`, `"email"`, `"number"`, `"search"`, `"tel"`, or `"url"`.
+   * @input {string} The type of control to display. The default type is text.
+   * Possible values are: `"text"`, `"password"`, `"email"`, `"number"`, `"search"`, `"tel"`, or `"url"`.
    */
   @Input()
   get type() {
-    return this._type;
+    return (this._isTextarea)
+      ? 'text'
+      : this._type;
   }
   set type(val: any) {
-    if (this._type !== TEXTAREA) {
-      this._type = 'text';
-
-      if (isString(val)) {
-        val = val.toLowerCase();
-
-        if (TEXT_TYPE_REGEX.test(val)) {
-          this._type = val;
-        }
-      }
-    }
-  }
-
-  /**
-   * @input {boolean} If true, the user cannot interact with this element.
-   */
-  @Input()
-  get disabled(): boolean {
-    return this._disabled;
-  }
-  set disabled(val: boolean) {
-    this.setDisabled(this._disabled = isTrueProperty(val));
-  }
-
-  /**
-   * @hidden
-   */
-  setDisabled(val: boolean) {
-    this._renderer.setElementAttribute(this._elementRef.nativeElement, 'disabled', val ? '' : null);
-    this._item && this._item.setElementClass('item-input-disabled', val);
-    this._native && this._native.isDisabled(val);
-  }
-
-  /**
-   * @hidden
-   */
-  setDisabledState(isDisabled: boolean) {
-    this.disabled = isDisabled;
+    this._type = val;
   }
 
   /**
@@ -254,7 +194,8 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @input {boolean} If true, the value will be cleared after focus upon edit. Defaults to `true` when `type` is `"password"`, `false` for all other types.
+   * @input {boolean} If true, the value will be cleared after focus upon edit.
+   * Defaults to `true` when `type` is `"password"`, `false` for all other types.
    */
   @Input()
   get clearOnEdit() {
@@ -265,375 +206,374 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @input {any} The minimum value, which must not be greater than its maximum (max attribute) value.
+   * @hidden
    */
-  @Input()
-  get min() {
-    return this._min;
-  }
-  set min(val: any) {
-    this.setMin(this._min = val);
-  }
+  @ViewChild('textInput', { read: ElementRef }) _native: ElementRef;
 
   /**
-   * @hidden
+   * @input {string} Instructional text that shows before the input has a value.
    */
-  setMin(val: any) {
-    this._native && this._native.setMin(val);
-  }
+  @Input() autocomplete: string = '';
 
   /**
-   * @input {any} The maximum value, which must not be less than its minimum (min attribute) value.
+   * @input {string} Instructional text that shows before the input has a value.
    */
-  @Input()
-  get max() {
-    return this._max;
-  }
-  set max(val: any) {
-    this.setMax(this._max = val);
-  }
+  @Input() autocorrect: string = '';
 
   /**
-   * @hidden
+   * @input {string} Instructional text that shows before the input has a value.
    */
-  setMax(val: any) {
-    this._native && this._native.setMax(val);
-  }
+  @Input() placeholder: string = '';
 
   /**
-   * @input {any} Works with the min and max attributes to limit the increments at which a value can be set.
+   * @input {any} The minimum value, which must not be greater than its maximum (max attribute) value.
    */
-  @Input()
-  get step() {
-    return this._step;
-  }
-  set step(val: any) {
-    this.setStep(this._step = val);
-  }
+  @Input() min: number | string = null;
 
   /**
-   * @hidden
+   * @input {any} The maximum value, which must not be less than its minimum (min attribute) value.
    */
-  setStep(val: any) {
-    this._native && this._native.setStep(val);
-  }
+  @Input() max: number | string = null;
 
   /**
-   * @hidden
+   * @input {any} Works with the min and max attributes to limit the increments at which a value can be set.
    */
-  @ViewChild('input', { read: NativeInput })
-  set _nativeInput(nativeInput: NativeInput) {
-    if (this.type !== TEXTAREA) {
-      this.setNativeInput(nativeInput);
-    }
-  }
+  @Input() step: number | string = null;
 
   /**
    * @hidden
    */
-  @ViewChild('textarea', { read: NativeInput })
-  set _nativeTextarea(nativeInput: NativeInput) {
-    if (this.type === TEXTAREA) {
-      this.setNativeInput(nativeInput);
-    }
-  }
+  @Output() input = new EventEmitter<UIEvent>();
 
   /**
    * @hidden
    */
-  @ViewChild(NextInput)
-  set _nextInput(nextInput: NextInput) {
-    if (nextInput) {
-      nextInput.focused.subscribe(() => {
-        this._form.tabFocus(this);
-      });
-    }
-  }
+  @Output() blur = new EventEmitter<UIEvent>();
 
   /**
-   * @output {event} Emitted when the input no longer has focus.
+   * @hidden
    */
-  @Output() blur: EventEmitter<Event> = new EventEmitter<Event>();
+  @Output() focus = new EventEmitter<UIEvent>();
 
-  /**
-   * @output {event} Emitted when the input has focus.
-   */
-  @Output() focus: EventEmitter<Event> = new EventEmitter<Event>();
+  constructor(
+    config: Config,
+    private _plt: Platform,
+    _form: Form,
+    private _app: App,
+    elementRef: ElementRef,
+    renderer: Renderer,
+    @Optional() private _content: Content,
+    @Optional() _item: Item,
+    @Optional() public ngControl: NgControl,
+    private _dom: DomController
+  ) {
+    super(config, elementRef, renderer, 'input', '', _form, _item, ngControl);
 
-  /**
-   * @hidden
-   */
-  setNativeInput(nativeInput: NativeInput) {
-    this._native = nativeInput;
-    nativeInput.setValue(this._value);
-    nativeInput.setMin(this._min);
-    nativeInput.setMax(this._max);
-    nativeInput.setStep(this._step);
-    nativeInput.isDisabled(this.disabled);
-
-    if (this._item && this._item.labelId !== null) {
-      nativeInput.labelledBy(this._item.labelId);
+    this.autocomplete = config.get('autocomplete', 'off');
+    this.autocorrect = config.get('autocorrect', 'off');
+    this._autoFocusAssist = config.get('autoFocusAssist', 'delay');
+    this._keyboardHeight = config.getNumber('keyboardHeight');
+    this._isTextarea = !!(elementRef.nativeElement.tagName === 'ION-TEXTAREA');
+
+    if (this._isTextarea && _item) {
+      _item.setElementClass('item-textarea', true);
+    }
+    // If not inside content, let's disable all the hacks
+    if (!_content) {
+      return;
     }
 
-    nativeInput.valueChange.subscribe((inputValue: any) => {
-      this.onChange(inputValue);
-      this.checkHasValue(inputValue);
-    });
+    const blurOnScroll = config.getBoolean('hideCaretOnScroll', false);
+    if (blurOnScroll) {
+      this._enableHideCaretOnScroll();
+    }
 
-    nativeInput.keydown.subscribe((inputValue: any) => {
-      this.onKeydown(inputValue);
-    });
+    const resizeAssist = config.getBoolean('resizeAssist', false);
+    if (resizeAssist) {
+      this._keyboardHeight = 60;
+      this._enableResizeAssist();
 
-    this.focusChange(this.hasFocus());
-    nativeInput.focusChange.subscribe((textInputHasFocus: any) => {
-      this.focusChange(textInputHasFocus);
-      this.checkHasValue(nativeInput.getValue());
-      if (!textInputHasFocus) {
-        this.onTouched(textInputHasFocus);
+    } else {
+      this._useAssist = config.getBoolean('scrollAssist', false);
+
+      const usePadding = config.getBoolean('scrollPadding', this._useAssist);
+      if (usePadding) {
+        this._enableScrollPadding();
       }
-    });
+    }
+  }
 
-    this.checkHasValue(nativeInput.getValue());
+  ngAfterContentInit() { }
 
-    var ionInputEle: HTMLElement = this._elementRef.nativeElement;
-    var nativeInputEle: HTMLElement = nativeInput.element();
+  /**
+   * @hidden
+   */
+  ngAfterViewInit() {
+    assert(this._native && this._native.nativeElement, 'input element must be valid');
+    // By default, password inputs clear after focus when they have content
+    if (this.clearOnEdit !== false && this.type === 'password') {
+      this.clearOnEdit = true;
+    }
+    const ionInputEle: HTMLElement = this._elementRef.nativeElement;
+    const nativeInputEle: HTMLElement = this._native.nativeElement;
 
-    // copy ion-input attributes to the native input element
+    // Copy remaining attributes, not handled by ionic/angular
     copyInputAttributes(ionInputEle, nativeInputEle);
 
+    // prevent having tabIndex duplicated
+    if (ionInputEle.hasAttribute('tabIndex')) {
+      ionInputEle.removeAttribute('tabIndex');
+    }
+
+    // handle the autofocus attribute
     if (ionInputEle.hasAttribute('autofocus')) {
-      // the ion-input element has the autofocus attributes
       ionInputEle.removeAttribute('autofocus');
-
-      if (this._autoFocusAssist === 'immediate') {
-        // config says to immediate focus on the input
-        // works best on android devices
-        nativeInputEle.focus();
-
-      } else if (this._autoFocusAssist === 'delay') {
-        // config says to chill out a bit and focus on the input after transitions
-        // works best on desktop
-        this._plt.timeout(() => {
+      switch (this._autoFocusAssist) {
+        case 'immediate':
+          // config says to immediate focus on the input
+          // works best on android devices
           nativeInputEle.focus();
-        }, 650);
+          break;
+        case 'delay':
+          // config says to chill out a bit and focus on the input after transitions
+          // works best on desktop
+          this._plt.timeout(() => nativeInputEle.focus(), 800);
+          break;
       }
-
       // traditionally iOS has big issues with autofocus on actual devices
       // autoFocus is disabled by default with the iOS mode config
     }
 
-    // by default set autocomplete="off" unless specified by the input
-    if (ionInputEle.hasAttribute('autocomplete')) {
-      this._autoComplete = ionInputEle.getAttribute('autocomplete');
-    }
-    nativeInputEle.setAttribute('autocomplete', this._autoComplete);
+    // Initialize the input (can start emitting events)
+    this._initialize();
 
-    // by default set autocorrect="off" unless specified by the input
-    if (ionInputEle.hasAttribute('autocorrect')) {
-      this._autoCorrect = ionInputEle.getAttribute('autocorrect');
+    if (this.focus.observers.length > 0) {
+      console.warn('(focus) is deprecated in ion-input, use (ionFocus) instead');
+    }
+    if (this.blur.observers.length > 0) {
+      console.warn('(blur) is deprecated in ion-input, use (ionBlur) instead');
     }
-    nativeInputEle.setAttribute('autocorrect', this._autoCorrect);
   }
 
   /**
    * @hidden
    */
-  initFocus() {
-    // begin the process of setting focus to the inner input element
-    const app = this._app;
-    const content = this._content;
-    const nav = this._nav;
-    const nativeInput = this._native;
-
-    console.debug(`input-base, initFocus(), scrollView: ${!!content}`);
-
-    if (content) {
-      // this input is inside of a scroll view
-      // find out if text input should be manually scrolled into view
-
-      // get container of this input, probably an ion-item a few nodes up
-      var ele: HTMLElement = this._elementRef.nativeElement;
-      ele = <HTMLElement>ele.closest('ion-item,[ion-item]') || ele;
-
-      var scrollData = getScrollData(ele.offsetTop, ele.offsetHeight, content.getContentDimensions(), this._keyboardHeight, this._plt.height());
-      if (Math.abs(scrollData.scrollAmount) < 4) {
-        // the text input is in a safe position that doesn't
-        // require it to be scrolled into view, just set focus now
-        this.setFocus();
-
-        // all good, allow clicks again
-        app.setEnabled(true);
-        nav && nav.setTransitioning(false);
-
-        if (this._usePadding) {
-          content.clearScrollPaddingFocusOut();
-        }
-        return;
-      }
-
-      if (this._usePadding) {
-        // add padding to the bottom of the scroll view (if needed)
-        content.addScrollPadding(scrollData.scrollPadding);
-      }
-
-      // manually scroll the text input to the top
-      // do not allow any clicks while it's scrolling
-      var scrollDuration = getScrollAssistDuration(scrollData.scrollAmount);
-      app.setEnabled(false, scrollDuration);
-      nav && nav.setTransitioning(true);
-
-      // temporarily move the focus to the focus holder so the browser
-      // doesn't freak out while it's trying to get the input in place
-      // at this point the native text input still does not have focus
-      nativeInput.beginFocus(true, scrollData.inputSafeY);
-
-      // scroll the input into place
-      content.scrollTo(0, scrollData.scrollTo, scrollDuration, () => {
-        console.debug(`input-base, scrollTo completed, scrollTo: ${scrollData.scrollTo}, scrollDuration: ${scrollDuration}`);
-        // the scroll view is in the correct position now
-        // give the native text input focus
-        nativeInput.beginFocus(false, 0);
-
-        // ensure this is the focused input
-        this.setFocus();
-
-        // all good, allow clicks again
-        app.setEnabled(true);
-        nav && nav.setTransitioning(false);
-
-        if (this._usePadding) {
-          content.clearScrollPaddingFocusOut();
-        }
-      });
-
-    } else {
-      // not inside of a scroll view, just focus it
-      this.setFocus();
-    }
+  ngOnDestroy() {
+    super.ngOnDestroy();
+    this._onDestroy.next();
+    this._onDestroy = null;
   }
 
   /**
    * @hidden
    */
-  setFocus() {
-    // immediately set focus
-    this._form.setAsFocused(this);
-
-    // set focus on the actual input element
-    console.debug(`input-base, setFocus ${this._native.element().value}`);
-    this._native.setFocus();
-
-    // ensure the body hasn't scrolled down
-    this._dom.write(() => {
-      this._plt.doc().body.scrollTop = 0;
-    });
+  initFocus() {
+    this.setFocus();
   }
 
   /**
    * @hidden
    */
-  scrollHideFocus(ev: ScrollEvent, shouldHideFocus: boolean) {
-    // do not continue if there's no nav, or it's transitioning
-    if (this._nav && this.hasFocus()) {
-      // if it does have focus, then do the dom write
-      this._dom.write(() => {
-        this._native.hideFocus(shouldHideFocus);
-      });
+  setFocus() {
+    // let's set focus to the element
+    // but only if it does not already have focus
+    if (!this.isFocus()) {
+      this._native.nativeElement.focus();
     }
   }
 
   /**
    * @hidden
    */
-  inputBlurred(ev: UIEvent) {
-    this.blur.emit(ev);
+  setBlur() {
+    if (this.isFocus()) {
+      this._native.nativeElement.blur();
+    }
   }
 
   /**
    * @hidden
    */
-  inputFocused(ev: UIEvent) {
-    this.focus.emit(ev);
+  onInput(ev: any) {
+    this.value = ev.target.value;
+
+    // TODO: deprecate this
+    this.input.emit(ev);
   }
 
   /**
    * @hidden
    */
-  writeValue(val: any) {
-    this._value = val;
-    this.checkHasValue(val);
+  onBlur(ev: UIEvent) {
+    this._fireBlur();
+
+    // TODO: deprecate this (06/07/2017)
+    this.blur.emit(ev);
+
+    this._scrollData = null;
+    if (this._clearOnEdit && this.hasValue()) {
+      this._didBlurAfterEdit = true;
+    }
   }
 
   /**
    * @hidden
    */
-  onChange(val: any) {
-    this.checkHasValue(val);
+  onFocus(ev: UIEvent) {
+    this._fireFocus();
+
+    // TODO: deprecate this (06/07/2017)
+    this.focus.emit(ev);
   }
 
   /**
    * @hidden
    */
-  onKeydown(val: any) {
-    if (this._clearOnEdit) {
-      this.checkClearOnEdit(val);
+  onKeydown(ev: any) {
+    if (ev && this._clearOnEdit) {
+      this.checkClearOnEdit(ev.target.value);
     }
   }
 
   /**
    * @hidden
    */
-  onTouched(val: any) {}
+  _inputUpdated() {
+    super._inputUpdated();
+    const inputEle = this._native.nativeElement;
+    const value = this._value;
+    if (inputEle.value !== value) {
+      inputEle.value = value;
+    }
+  }
 
   /**
    * @hidden
    */
-  hasFocus(): boolean {
-    // check if an input has focus or not
-    return this._plt.hasFocus(this._native.element());
+  clearTextInput() {
+    this.value = '';
   }
 
   /**
-   * @hidden
-   */
-  hasValue(): boolean {
-    const inputValue = this._value;
-    return (inputValue !== null && inputValue !== undefined && inputValue !== '');
+  * Check if we need to clear the text input if clearOnEdit is enabled
+  * @hidden
+  */
+  checkClearOnEdit(_: string) {
+    if (!this._clearOnEdit) {
+      return;
+    }
+
+    // Did the input value change after it was blurred and edited?
+    if (this._didBlurAfterEdit && this.hasValue()) {
+      // Clear the input
+      this.clearTextInput();
+    }
+
+    // Reset the flag
+    this._didBlurAfterEdit = false;
   }
 
-  /**
-   * @hidden
-   */
-  checkHasValue(inputValue: any) {
-    if (this._item) {
-      var hasValue = (inputValue !== null && inputValue !== undefined && inputValue !== '');
-      // TODO remove all uses of input-has-value in v4
-      this._item.setElementClass('input-has-value', hasValue);
-      this._item.setElementClass('item-input-has-value', hasValue);
+  _getScrollData(): ScrollData {
+    if (!this._content) {
+      return newScrollData();
     }
+
+    // get container of this input, probably an ion-item a few nodes up
+    if (this._scrollData) {
+      return this._scrollData;
+    }
+    let ele: HTMLElement = this._elementRef.nativeElement;
+    ele = <HTMLElement>ele.closest('ion-item,[ion-item]') || ele;
+    return this._scrollData = getScrollData(
+      ele.offsetTop, ele.offsetHeight,
+      this._content.getContentDimensions(), this._keyboardHeight, this._plt.height());
   }
 
-  /**
-   * @hidden
-   */
-  focusChange(inputHasFocus: boolean) {
-    if (this._item) {
-      console.debug(`input-base, focusChange, inputHasFocus: ${inputHasFocus}, ${this._item.getNativeElement().nodeName}.${this._item.getNativeElement().className}`);
-      // TODO remove input-has-focus for v4
-      this._item.setElementClass('input-has-focus', inputHasFocus);
-      this._item.setElementClass('item-input-has-focus', inputHasFocus);
+  _relocateInput(shouldRelocate: boolean) {
+    if (this._relocated === shouldRelocate) {
+      return;
     }
+    const platform = this._plt;
+    const componentEle = this.getNativeElement();
+    const focusedInputEle = this._native.nativeElement;
+    console.debug(`native-input, hideCaret, shouldHideCaret: ${shouldRelocate}, input value: ${focusedInputEle.value}`);
+    if (shouldRelocate) {
+      // this allows for the actual input to receive the focus from
+      // the user's touch event, but before it receives focus, it
+      // moves the actual input to a location that will not screw
+      // up the app's layout, and does not allow the native browser
+      // to attempt to scroll the input into place (messing up headers/footers)
+      // the cloned input fills the area of where native input should be
+      // while the native input fakes out the browser by relocating itself
+      // before it receives the actual focus event
+      // We hide the focused input (with the visible caret) invisiable by making it scale(0),
+      cloneInputComponent(platform, componentEle, focusedInputEle);
+      const inputRelativeY = this._getScrollData().inputSafeY;
+      // fix for #11817
+      const tx = this._plt.isRTL ? 9999 : -9999;
+      focusedInputEle.style[platform.Css.transform] = `translate3d(${tx}px,${inputRelativeY}px,0)`;
+      focusedInputEle.style.opacity = '0';
 
-    // If clearOnEdit is enabled and the input blurred but has a value, set a flag
-    if (this._clearOnEdit && !inputHasFocus && this.hasValue()) {
-      this._didBlurAfterEdit = true;
+    } else {
+      removeClone(platform, componentEle, focusedInputEle);
     }
+    this._relocated = shouldRelocate;
   }
 
-  /**
-   * @hidden
-   */
-  pointerStart(ev: UIEvent) {
+  _enableScrollPadding() {
+    assert(this._content, 'content is undefined');
+
+    console.debug('Input: enableScrollPadding');
+
+    this.ionFocus.subscribe(() => {
+      const content = this._content;
+
+      // add padding to the bottom of the scroll view (if needed)
+      content.addScrollPadding(this._getScrollData().scrollPadding);
+      content.clearScrollPaddingFocusOut();
+    });
+  }
+
+  _enableHideCaretOnScroll() {
+    assert(this._content, 'content is undefined');
+
+    const content = this._content;
+    console.debug('Input: enableHideCaretOnScroll');
+
+    content.ionScrollStart
+      .takeUntil(this._onDestroy)
+      .subscribe(() => scrollHideCaret(true));
+
+    content.ionScrollEnd
+      .takeUntil(this._onDestroy)
+      .subscribe(() => scrollHideCaret(false));
+
+    this.ionBlur.subscribe(() => this._relocateInput(false));
+
+    const self = this;
+    function scrollHideCaret(shouldHideCaret: boolean) {
+      // if it does have focus, then do the dom write
+      if (self.isFocus()) {
+        self._dom.write(() => self._relocateInput(shouldHideCaret));
+      }
+    }
+  }
+
+  _enableResizeAssist() {
+    assert(this._content, 'content is undefined');
+
+    console.debug('Input: enableAutoScroll');
+    this.ionFocus.subscribe(() => {
+      const scrollData = this._getScrollData();
+      if (Math.abs(scrollData.scrollAmount) > 100) {
+        this._content.scrollTo(0, scrollData.scrollTo, scrollData.scrollDuration);
+      }
+    });
+  }
+
+  _pointerStart(ev: UIEvent) {
+    assert(this._content, 'content is undefined');
+
     // input cover touchstart
     if (ev.type === 'touchstart') {
       this._isTouch = true;
@@ -647,10 +587,9 @@ export class TextInput extends Ion implements IonicFormInput {
     console.debug(`input-base, pointerStart, type: ${ev.type}`);
   }
 
-  /**
-   * @hidden
-   */
-  pointerEnd(ev: UIEvent) {
+  _pointerEnd(ev: UIEvent) {
+    assert(this._content, 'content is undefined');
+
     // input cover touchend/mouseup
     console.debug(`input-base, pointerEnd, type: ${ev.type}`);
 
@@ -662,130 +601,56 @@ export class TextInput extends Ion implements IonicFormInput {
 
     } else if (this._coord) {
       // get where the touchend/mouseup ended
-      let endCoord = pointerCoord(ev);
+      var endCoord = pointerCoord(ev);
 
       // focus this input if the pointer hasn't moved XX pixels
       // and the input doesn't already have focus
-      if (!hasPointerMoved(8, this._coord, endCoord) && !this.hasFocus()) {
+      if (!hasPointerMoved(8, this._coord, endCoord) && !this.isFocus()) {
         ev.preventDefault();
         ev.stopPropagation();
 
         // begin the input focus process
-        this.initFocus();
+        this._jsSetFocus();
       }
     }
 
     this._coord = null;
   }
-  /**
-   * @hidden
-   */
-  setItemInputControlCss() {
-    let item = this._item;
-    let nativeInput = this._native;
-    let inputControl = this.inputControl;
-
-    // Set the control classes on the item
-    if (item && inputControl) {
-      setControlCss(item, inputControl);
-    }
-
-    // Set the control classes on the native input
-    if (nativeInput && inputControl) {
-      setControlCss(nativeInput, inputControl);
-    }
-  }
-
-  /**
-   * @hidden
-   */
-  ngOnInit() {
-    const item = this._item;
-    if (item) {
-      if (this.type === TEXTAREA) {
-        item.setElementClass('item-textarea', true);
-      }
-      item.setElementClass('item-input', true);
-      item.registerInput(this.type);
-    }
-
-    // By default, password inputs clear after focus when they have content
-    if (this.type === 'password' && this.clearOnEdit !== false) {
-      this.clearOnEdit = true;
-    }
-  }
-
-  /**
-   * @hidden
-   */
-  ngAfterContentChecked() {
-    this.setItemInputControlCss();
-  }
 
-  /**
-   * @hidden
-   */
-  ngOnDestroy() {
-    this._form.deregister(this);
+  _jsSetFocus() {
+    assert(this._content, 'content is undefined');
 
-    // only stop listening to content scroll events if there is content
-    if (this._content) {
-      this._scrollStart.unsubscribe();
-      this._scrollEnd.unsubscribe();
+    // begin the process of setting focus to the inner input element
+    const content = this._content;
+    console.debug(`input-base, initFocus(), scrollView: ${!!content}`);
+    if (!content) {
+      // not inside of a scroll view, just focus it
+      this.setFocus();
     }
-  }
-
-  /**
-   * @hidden
-   */
-  clearTextInput() {
-    console.debug('Should clear input');
-    this._value = '';
-    this.onChange(this._value);
-    this.writeValue(this._value);
-  }
 
-  /**
-  * Check if we need to clear the text input if clearOnEdit is enabled
-  * @hidden
-  */
-  checkClearOnEdit(inputValue: string) {
-    if (!this._clearOnEdit) {
+    var scrollData = this._getScrollData();
+    if (Math.abs(scrollData.scrollAmount) < 4) {
+      // the text input is in a safe position that doesn't
+      // require it to be scrolled into view, just set focus now
+      this.setFocus();
       return;
     }
 
-    // Did the input value change after it was blurred and edited?
-    if (this._didBlurAfterEdit && this.hasValue()) {
-      // Clear the input
-      this.clearTextInput();
-    }
-
-    // Reset the flag
-    this._didBlurAfterEdit = false;
-  }
-
-  /**
-   * @hidden
-   * Angular2 Forms API method called by the view (formControlName) to register the
-   * onChange event handler that updates the model (Control).
-   * @param {Function} fn  the onChange event handler.
-   */
-  registerOnChange(fn: any) { this.onChange = fn; }
-
-  /**
-   * @hidden
-   * Angular2 Forms API method called by the view (formControlName) to register
-   * the onTouched event handler that marks model (Control) as touched.
-   * @param {Function} fn  onTouched event handler.
-   */
-  registerOnTouched(fn: any) { this.onTouched = fn; }
+    // temporarily move the focus to the focus holder so the browser
+    // doesn't freak out while it's trying to get the input in place
+    // at this point the native text input still does not have focus
+    this._relocateInput(true);
+    this.setFocus();
 
+    // scroll the input into place
+    content.scrollTo(0, scrollData.scrollTo, scrollData.scrollDuration, () => {
+      // the scroll view is in the correct position now
+      // give the native text input focus
+      this._relocateInput(false);
 
-  /**
-   * @hidden
-   */
-  focusNext() {
-    this._form.tabFocus(this);
+      // ensure this is the focused input
+      this.setFocus();
+    });
   }
 
 }
@@ -837,29 +702,41 @@ export class TextInput extends Ion implements IonicFormInput {
 
 
 const SCROLL_ASSIST_SPEED = 0.3;
-const TEXTAREA = 'textarea';
-const TEXT_TYPE_REGEX = /password|email|number|search|tel|url|date|month|time|week/;
 
+function newScrollData(): ScrollData {
+  return {
+    scrollAmount: 0,
+    scrollTo: 0,
+    scrollPadding: 0,
+    scrollDuration: 0,
+    inputSafeY: 0
+  };
+}
 
 /**
  * @hidden
  */
-export function getScrollData(inputOffsetTop: number, inputOffsetHeight: number, scrollViewDimensions: ContentDimensions, keyboardHeight: number, plaformHeight: number) {
+export function getScrollData(
+  inputOffsetTop: number,
+  inputOffsetHeight: number,
+  scrollViewDimensions: ContentDimensions,
+  keyboardHeight: number,
+  plaformHeight: number): ScrollData {
   // compute input's Y values relative to the body
-  let inputTop = (inputOffsetTop + scrollViewDimensions.contentTop - scrollViewDimensions.scrollTop);
-  let inputBottom = (inputTop + inputOffsetHeight);
+  const inputTop = (inputOffsetTop + scrollViewDimensions.contentTop - scrollViewDimensions.scrollTop);
+  const inputBottom = (inputTop + inputOffsetHeight);
 
   // compute the safe area which is the viewable content area when the soft keyboard is up
-  let safeAreaTop = scrollViewDimensions.contentTop;
-  let safeAreaHeight = (plaformHeight - keyboardHeight - safeAreaTop) / 2;
-  let safeAreaBottom = safeAreaTop + safeAreaHeight;
+  const safeAreaTop = scrollViewDimensions.contentTop;
+  const safeAreaHeight = (plaformHeight - keyboardHeight - safeAreaTop) / 2;
+  const safeAreaBottom = safeAreaTop + safeAreaHeight;
 
   // figure out if each edge of teh input is within the safe area
-  let inputTopWithinSafeArea = (inputTop >= safeAreaTop && inputTop <= safeAreaBottom);
-  let inputTopAboveSafeArea = (inputTop < safeAreaTop);
-  let inputTopBelowSafeArea = (inputTop > safeAreaBottom);
-  let inputBottomWithinSafeArea = (inputBottom >= safeAreaTop && inputBottom <= safeAreaBottom);
-  let inputBottomBelowSafeArea = (inputBottom > safeAreaBottom);
+  const inputTopWithinSafeArea = (inputTop >= safeAreaTop && inputTop <= safeAreaBottom);
+  const inputTopAboveSafeArea = (inputTop < safeAreaTop);
+  const inputTopBelowSafeArea = (inputTop > safeAreaBottom);
+  const inputBottomWithinSafeArea = (inputBottom >= safeAreaTop && inputBottom <= safeAreaBottom);
+  const inputBottomBelowSafeArea = (inputBottom > safeAreaBottom);
 
   /*
   Text Input Scroll To Scenarios
@@ -873,12 +750,7 @@ export function getScrollData(inputOffsetTop: number, inputOffsetHeight: number,
   7) Input top below safe area, no room to scroll, input larger than safe area
   */
 
-  const scrollData: ScrollData = {
-    scrollAmount: 0,
-    scrollTo: 0,
-    scrollPadding: 0,
-    inputSafeY: 0
-  };
+  const scrollData: ScrollData = newScrollData();
 
   if (inputTopWithinSafeArea && inputBottomWithinSafeArea) {
     // Input top within safe area, bottom within safe area
@@ -924,46 +796,73 @@ export function getScrollData(inputOffsetTop: number, inputOffsetHeight: number,
   // to have the padding already rendered so there's no jank
   scrollData.scrollPadding = keyboardHeight;
 
-  // var safeAreaEle: HTMLElement = (<any>window).safeAreaEle;
-  // if (!safeAreaEle) {
-  //   safeAreaEle = (<any>window).safeAreaEle  = document.createElement('div');
-  //   safeAreaEle.style.cssText = 'position:absolute; padding:1px 5px; left:0; right:0; font-weight:bold; font-size:10px; font-family:Courier; text-align:right; background:rgba(0, 128, 0, 0.8); text-shadow:1px 1px white; pointer-events:none;';
-  //   document.body.appendChild(safeAreaEle);
-  // }
-  // safeAreaEle.style.top = safeAreaTop + 'px';
-  // safeAreaEle.style.height = safeAreaHeight + 'px';
-  // safeAreaEle.innerHTML = `
-  //   <div>scrollTo: ${scrollData.scrollTo}</div>
-  //   <div>scrollAmount: ${scrollData.scrollAmount}</div>
-  //   <div>scrollPadding: ${scrollData.scrollPadding}</div>
-  //   <div>inputSafeY: ${scrollData.inputSafeY}</div>
-  //   <div>scrollHeight: ${scrollViewDimensions.scrollHeight}</div>
-  //   <div>scrollTop: ${scrollViewDimensions.scrollTop}</div>
-  //   <div>contentHeight: ${scrollViewDimensions.contentHeight}</div>
-  //   <div>plaformHeight: ${plaformHeight}</div>
-  // `;
+  // calculate animation duration
+  const distance = Math.abs(scrollData.scrollAmount);
+  const duration = distance / SCROLL_ASSIST_SPEED;
+  scrollData.scrollDuration = Math.min(400, Math.max(150, duration));
 
   return scrollData;
 }
 
-function setControlCss(element: any, control: NgControl) {
-  element.setElementClass('ng-untouched', control.untouched);
-  element.setElementClass('ng-touched', control.touched);
-  element.setElementClass('ng-pristine', control.pristine);
-  element.setElementClass('ng-dirty', control.dirty);
-  element.setElementClass('ng-valid', control.valid);
-  element.setElementClass('ng-invalid', !control.valid);
+function cloneInputComponent(plt: Platform, srcComponentEle: HTMLInputElement, srcNativeInputEle: HTMLInputElement) {
+  // Make sure we kill all the clones before creating new ones
+  // It is a defensive, removeClone() should do nothing
+  // removeClone(plt, srcComponentEle, srcNativeInputEle);
+  assert(srcComponentEle.parentElement.querySelector('.cloned-input') === null, 'leaked cloned input');
+  // given a native <input> or <textarea> element
+  // find its parent wrapping component like <ion-input> or <ion-textarea>
+  // then clone the entire component
+  if (srcComponentEle) {
+    // DOM READ
+    var srcTop = srcComponentEle.offsetTop;
+    var srcLeft = srcComponentEle.offsetLeft;
+    var srcWidth = srcComponentEle.offsetWidth;
+    var srcHeight = srcComponentEle.offsetHeight;
+
+    // DOM WRITE
+    // not using deep clone so we don't pull in unnecessary nodes
+    var clonedComponentEle = <HTMLElement>srcComponentEle.cloneNode(false);
+    var clonedStyle = clonedComponentEle.style;
+    clonedComponentEle.classList.add('cloned-input');
+    clonedComponentEle.setAttribute('aria-hidden', 'true');
+    clonedStyle.pointerEvents = 'none';
+    clonedStyle.position = 'absolute';
+    clonedStyle.top = srcTop + 'px';
+    clonedStyle.left = srcLeft + 'px';
+    clonedStyle.width = srcWidth + 'px';
+    clonedStyle.height = srcHeight + 'px';
+
+    var clonedNativeInputEle = <HTMLInputElement>srcNativeInputEle.cloneNode(false);
+    clonedNativeInputEle.value = srcNativeInputEle.value;
+    clonedNativeInputEle.tabIndex = -1;
+
+    clonedComponentEle.appendChild(clonedNativeInputEle);
+    srcComponentEle.parentNode.appendChild(clonedComponentEle);
+
+    srcComponentEle.style.pointerEvents = 'none';
+  }
+
+  (<any>srcNativeInputEle.style)[plt.Css.transform] = 'scale(0)';
 }
 
-function getScrollAssistDuration(distanceToScroll: number) {
-  distanceToScroll = Math.abs(distanceToScroll);
-  let duration = distanceToScroll / SCROLL_ASSIST_SPEED;
-  return Math.min(400, Math.max(150, duration));
+function removeClone(plt: Platform, srcComponentEle: HTMLElement, srcNativeInputEle: HTMLElement) {
+  if (srcComponentEle && srcComponentEle.parentElement) {
+    var clonedInputEles = srcComponentEle.parentElement.querySelectorAll('.cloned-input');
+    for (var i = 0; i < clonedInputEles.length; i++) {
+      clonedInputEles[i].parentNode.removeChild(clonedInputEles[i]);
+    }
+
+    srcComponentEle.style.pointerEvents = '';
+  }
+  (<any>srcNativeInputEle.style)[plt.Css.transform] = '';
+  srcNativeInputEle.style.opacity = '';
 }
 
+
 export interface ScrollData {
   scrollAmount: number;
   scrollTo: number;
   scrollPadding: number;
+  scrollDuration: number;
   inputSafeY: number;
 }
diff --git a/src/components/input/native-input.ts b/src/components/input/native-input.ts
deleted file mode 100644
index 3ef87a73bab..00000000000
--- a/src/components/input/native-input.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-import { Directive, ElementRef, EventEmitter, HostListener, Output, Renderer } from '@angular/core';
-import { NgControl } from '@angular/forms';
-
-import { Config } from '../../config/config';
-import { Platform } from '../../platform/platform';
-
-
-/**
- * @hidden
- */
-@Directive({
-  selector: '.text-input'
-})
-export class NativeInput {
-  _relocated: boolean;
-  _clone: boolean;
-  _blurring: boolean;
-  _unrefBlur: Function;
-
-  @Output() focusChange: EventEmitter<boolean> = new EventEmitter<boolean>();
-  @Output() valueChange: EventEmitter<string> = new EventEmitter<string>();
-  @Output() keydown: EventEmitter<string> = new EventEmitter<string>();
-
-  constructor(
-    public _elementRef: ElementRef,
-    public _renderer: Renderer,
-    config: Config,
-    private _plt: Platform,
-    public ngControl: NgControl
-  ) {
-    this._clone = config.getBoolean('inputCloning', false);
-    this._blurring = config.getBoolean('inputBlurring', false);
-  }
-
-  @HostListener('input', ['$event'])
-  _change(ev: any) {
-    this.valueChange.emit(ev.target.value);
-  }
-
-  @HostListener('keydown', ['$event'])
-  _keyDown(ev: any) {
-    if (ev) {
-      ev.target && this.keydown.emit(ev.target.value);
-    }
-  }
-
-  @HostListener('focus')
-  _focus() {
-    var self = this;
-
-    self.focusChange.emit(true);
-
-    if (self._blurring) {
-      // automatically blur input if:
-      // 1) this input has focus
-      // 2) the newly tapped document element is not an input
-      console.debug(`native-input, blurring enabled`);
-
-      var unregTouchEnd = this._plt.registerListener(this._plt.doc(), 'touchend', (ev: TouchEvent) => {
-        var tapped = <HTMLElement>ev.target;
-        if (tapped && self.element()) {
-          if (tapped.tagName !== 'INPUT' && tapped.tagName !== 'TEXTAREA' && !tapped.classList.contains('input-cover')) {
-            self.element().blur();
-          }
-        }
-      }, {
-        capture: true,
-        zone: false
-      });
-
-      self._unrefBlur = function() {
-        console.debug(`native-input, blurring disabled`);
-        unregTouchEnd();
-      };
-    }
-  }
-
-  @HostListener('blur')
-  _blur() {
-    this.focusChange.emit(false);
-    this.hideFocus(false);
-
-    this._unrefBlur && this._unrefBlur();
-    this._unrefBlur = null;
-  }
-
-  labelledBy(val: string) {
-    this._renderer.setElementAttribute(this._elementRef.nativeElement, 'aria-labelledby', val);
-  }
-
-  isDisabled(val: boolean) {
-    this._renderer.setElementAttribute(this._elementRef.nativeElement, 'disabled', val ? '' : null);
-  }
-
-  setFocus() {
-    // let's set focus to the element
-    // but only if it does not already have focus
-    if (this._plt.getActiveElement() !== this.element()) {
-      this.element().focus();
-    }
-  }
-
-  beginFocus(shouldFocus: boolean, inputRelativeY: number) {
-    if (this._relocated !== shouldFocus) {
-      const focusedInputEle = this.element();
-      if (shouldFocus) {
-        // we should focus into this element
-
-        if (this._clone) {
-          // this platform needs the input to be cloned
-          // this allows for the actual input to receive the focus from
-          // the user's touch event, but before it receives focus, it
-          // moves the actual input to a location that will not screw
-          // up the app's layout, and does not allow the native browser
-          // to attempt to scroll the input into place (messing up headers/footers)
-          // the cloned input fills the area of where native input should be
-          // while the native input fakes out the browser by relocating itself
-          // before it receives the actual focus event
-          cloneInputComponent(this._plt, focusedInputEle);
-
-          // move the native input to a location safe to receive focus
-          // according to the browser, the native input receives focus in an
-          // area which doesn't require the browser to scroll the input into place
-          (<any>focusedInputEle.style)[this._plt.Css.transform] = `translate3d(-9999px,${inputRelativeY}px,0)`;
-          focusedInputEle.style.opacity = '0';
-        }
-
-        // let's now set focus to the actual native element
-        // at this point it is safe to assume the browser will not attempt
-        // to scroll the input into view itself (screwing up headers/footers)
-        this.setFocus();
-
-      } else {
-        // should remove the focus
-        if (this._clone) {
-          // should remove the cloned node
-          removeClone(this._plt, focusedInputEle);
-        }
-      }
-
-      this._relocated = shouldFocus;
-    }
-  }
-
-  hideFocus(shouldHideFocus: boolean) {
-    let focusedInputEle = this.element();
-
-    console.debug(`native-input, hideFocus, shouldHideFocus: ${shouldHideFocus}, input value: ${focusedInputEle.value}`);
-
-    if (shouldHideFocus) {
-      cloneInputComponent(this._plt, focusedInputEle);
-      (<any>focusedInputEle.style)[this._plt.Css.transform] = 'scale(0)';
-
-    } else {
-      removeClone(this._plt, focusedInputEle);
-    }
-  }
-
-  setValue(val: any) {
-    this._elementRef.nativeElement['value'] = val;
-  }
-
-  getValue(): string {
-    return this.element().value;
-  }
-
-  setMin(val: any) {
-    this._elementRef.nativeElement['min'] = val;
-  }
-
-  setMax(val: any) {
-    this._elementRef.nativeElement['max'] = val;
-  }
-
-  setStep(val: any) {
-    this._elementRef.nativeElement['step'] = val;
-  }
-
-  setElementClass(cssClass: string, shouldAdd: boolean) {
-    this._renderer.setElementClass(this._elementRef.nativeElement, cssClass, shouldAdd);
-  }
-
-  element(): HTMLInputElement {
-    return this._elementRef.nativeElement;
-  }
-
-  ngOnDestroy() {
-    this._unrefBlur && this._unrefBlur();
-  }
-
-}
-
-function cloneInputComponent(plt: Platform, srcNativeInputEle: HTMLInputElement) {
-  // given a native <input> or <textarea> element
-  // find its parent wrapping component like <ion-input> or <ion-textarea>
-  // then clone the entire component
-  const srcComponentEle = <HTMLElement>srcNativeInputEle.closest('ion-input,ion-textarea');
-  if (srcComponentEle) {
-    // DOM READ
-    const srcTop = srcComponentEle.offsetTop;
-    const srcLeft = srcComponentEle.offsetLeft;
-    const srcWidth = srcComponentEle.offsetWidth;
-    const srcHeight = srcComponentEle.offsetHeight;
-
-    // DOM WRITE
-    // not using deep clone so we don't pull in unnecessary nodes
-    const clonedComponentEle = <HTMLElement>srcComponentEle.cloneNode(false);
-    clonedComponentEle.classList.add('cloned-input');
-    clonedComponentEle.setAttribute('aria-hidden', 'true');
-    clonedComponentEle.style.pointerEvents = 'none';
-    clonedComponentEle.style.position = 'absolute';
-    clonedComponentEle.style.top = srcTop + 'px';
-    clonedComponentEle.style.left = srcLeft + 'px';
-    clonedComponentEle.style.width = srcWidth + 'px';
-    clonedComponentEle.style.height = srcHeight + 'px';
-
-    const clonedNativeInputEle = <HTMLInputElement>srcNativeInputEle.cloneNode(false);
-    clonedNativeInputEle.value = srcNativeInputEle.value;
-    clonedNativeInputEle.tabIndex = -1;
-
-    clonedComponentEle.appendChild(clonedNativeInputEle);
-    srcComponentEle.parentNode.appendChild(clonedComponentEle);
-
-    srcComponentEle.style.pointerEvents = 'none';
-  }
-
-  (<any>srcNativeInputEle.style)[plt.Css.transform] = 'scale(0)';
-}
-
-function removeClone(plt: Platform, srcNativeInputEle: HTMLElement) {
-  const srcComponentEle = <HTMLElement>srcNativeInputEle.closest('ion-input,ion-textarea');
-  if (srcComponentEle && srcComponentEle.parentElement) {
-    const clonedInputEles = srcComponentEle.parentElement.querySelectorAll('.cloned-input');
-    for (var i = 0; i < clonedInputEles.length; i++) {
-      clonedInputEles[i].parentNode.removeChild(clonedInputEles[i]);
-    }
-
-    srcComponentEle.style.pointerEvents = '';
-  }
-  (<any>srcNativeInputEle.style)[plt.Css.transform] = '';
-  srcNativeInputEle.style.opacity = '';
-}
diff --git a/src/components/input/next-input.ts b/src/components/input/next-input.ts
deleted file mode 100644
index 3f0858fc9c2..00000000000
--- a/src/components/input/next-input.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Directive, EventEmitter, HostListener, Output } from '@angular/core';
-
-/**
- * @hidden
- */
-@Directive({
-  selector: '[next-input]'
-})
-export class NextInput {
-  @Output() focused: EventEmitter<boolean> = new EventEmitter<boolean>();
-
-  @HostListener('focus')
-  receivedFocus() {
-    console.debug('native-input, next-input received focus');
-    this.focused.emit(true);
-  }
-
-}
diff --git a/src/components/input/test/attributes/app/app.component.ts b/src/components/input/test/attributes/app/app.component.ts
new file mode 100644
index 00000000000..dcf2f9e7e73
--- /dev/null
+++ b/src/components/input/test/attributes/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/input/test/attributes/app/app.module.ts b/src/components/input/test/attributes/app/app.module.ts
new file mode 100644
index 00000000000..7f76975a263
--- /dev/null
+++ b/src/components/input/test/attributes/app/app.module.ts
@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
diff --git a/src/components/nav/test/nav-push-pop/main.ts b/src/components/input/test/attributes/app/main.ts
similarity index 100%
rename from src/components/nav/test/nav-push-pop/main.ts
rename to src/components/input/test/attributes/app/main.ts
diff --git a/src/components/input/test/attributes/e2e.ts b/src/components/input/test/attributes/e2e.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/components/input/test/attributes/pages/root-page/root-page.html b/src/components/input/test/attributes/pages/root-page/root-page.html
new file mode 100644
index 00000000000..c7e03960992
--- /dev/null
+++ b/src/components/input/test/attributes/pages/root-page/root-page.html
@@ -0,0 +1,39 @@
+<ion-header>
+
+  <ion-toolbar>
+    <ion-title>Input attributes</ion-title>
+  </ion-toolbar>
+
+</ion-header>
+
+<ion-content>
+    <ion-list>
+      <ion-item>
+        <ion-label stacked>Stacked</ion-label>
+        <ion-input #input1
+          type="number"
+          placeholder="Placeholder"
+          value="1234"
+          id="mystackinput"
+          name="holaa"
+          min="0"
+          max="10000"
+          step="2"
+          autocomplete="on"
+          autocorrect="on"
+          autocapitalize="on"
+          spellcheck="true"
+          maxlength="4"
+          disabled
+          readonly
+        ></ion-input>
+      </ion-item>
+
+      <ion-list>
+        <ion-item *ngIf="input1Valid" color="secondary">Test passed</ion-item>
+        <ion-item *ngIf="!input1Valid" color="danger">Test FAILED</ion-item>
+      </ion-list>
+
+    </ion-list>
+
+</ion-content>
diff --git a/src/components/input/test/attributes/pages/root-page/root-page.module.ts b/src/components/input/test/attributes/pages/root-page/root-page.module.ts
new file mode 100644
index 00000000000..85fba79181b
--- /dev/null
+++ b/src/components/input/test/attributes/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/attributes/pages/root-page/root-page.ts b/src/components/input/test/attributes/pages/root-page/root-page.ts
new file mode 100644
index 00000000000..d33987eb606
--- /dev/null
+++ b/src/components/input/test/attributes/pages/root-page/root-page.ts
@@ -0,0 +1,59 @@
+import { Component, ViewChild } from '@angular/core';
+import { TextInput } from '../../../../../../';
+
+@Component({
+  templateUrl: 'root-page.html'
+})
+export class RootPage {
+
+  input1Valid: boolean;
+  input2Valid: boolean;
+
+  @ViewChild('input1') input1: TextInput;
+
+  ionViewDidEnter() {
+    this.input1Valid = this.checkInput1();
+  }
+
+  checkInput1(): boolean {
+    const nativeEle = <HTMLElement>this.input1._native.nativeElement;
+
+    return testAttributes(nativeEle, {
+      id: null,
+      type: 'number',
+      placeholder: 'Placeholder',
+      name: 'holaa',
+      min: '0',
+      max: '10000',
+      step: '2',
+      autocomplete: 'on',
+      autocorrect: 'on',
+      autocapitalize: 'on',
+      spellcheck: 'true',
+      maxLength: '4',
+      'aria-labelledby': 'lbl-0',
+      readOnly: true,
+      disabled: true
+    });
+  }
+}
+
+function testAttributes(ele: HTMLElement, attributes: any): boolean {
+  for (let attr in attributes) {
+    const expected = attributes[attr];
+    const value = (<any>ele)[attr];
+
+    if (expected === null) {
+      if (ele.hasAttribute(attr) || value !== '') {
+        console.error(`Element should NOT have "${attr}"`);
+        return false;
+      }
+    } else {
+      if (expected !== value && expected !== ele.getAttribute(attr)) {
+        console.error(`Value "${attr}" does not match: ${expected} != ${value}`);
+        return false;
+      }
+    }
+  }
+  return true;
+}
diff --git a/src/components/input/test/form-inputs/pages/root-page/root-page.ts b/src/components/input/test/form-inputs/pages/root-page/root-page.ts
index 3b1a44bf7f7..9c3a7983dd9 100644
--- a/src/components/input/test/form-inputs/pages/root-page/root-page.ts
+++ b/src/components/input/test/form-inputs/pages/root-page/root-page.ts
@@ -47,7 +47,7 @@ export class RootPage {
     }
   }
 
-  submit(ev: UIEvent, value?: any) {
+  submit(_: UIEvent, value?: any) {
     console.log('Submitted', value);
     this.submitted = true;
   }
diff --git a/src/components/input/test/highlight/pages/root-page/root-page.html b/src/components/input/test/highlight/pages/root-page/root-page.html
index 47c7c95fe76..9529c9bdcda 100644
--- a/src/components/input/test/highlight/pages/root-page/root-page.html
+++ b/src/components/input/test/highlight/pages/root-page/root-page.html
@@ -102,4 +102,16 @@
       </ion-list>
     </ion-card>
   </form>
-</ion-content>
\ No newline at end of file
+</ion-content>
+
+<ion-footer>
+  <ion-toolbar>
+  <ion-input style="background: white;
+margin: 3px;
+padding: 0px 8px;
+border: 1px solid gray;
+border-radius: 5px;
+width: auto;
+transform: translateZ(0);" placeholder="chat here"></ion-input>
+  </ion-toolbar>
+</ion-footer>
\ No newline at end of file
diff --git a/src/components/input/test/highlight/pages/root-page/root-page.ts b/src/components/input/test/highlight/pages/root-page/root-page.ts
index ea09d64ffe3..688869672a5 100644
--- a/src/components/input/test/highlight/pages/root-page/root-page.ts
+++ b/src/components/input/test/highlight/pages/root-page/root-page.ts
@@ -38,7 +38,7 @@ export class RootPage {
     }
   }
 
-  submit(ev: UIEvent, value: any) {
+  submit(_: UIEvent, value: any) {
     console.log('Submitted', value);
     this.submitted = true;
   }
diff --git a/src/components/input/test/text-input.spec.ts b/src/components/input/test/text-input.spec.ts
index 0525aaf4d69..589dd47ba10 100644
--- a/src/components/input/test/text-input.spec.ts
+++ b/src/components/input/test/text-input.spec.ts
@@ -1,9 +1,38 @@
-import { getScrollData } from '../input';
+import { TextInput, getScrollData } from '../input';
 import { ContentDimensions } from '../../content/content';
-
+import { mockApp, mockConfig, mockDomController, mockElementRef, mockElementRefEle, mockForm, mockItem, mockPlatform, mockRenderer } from '../../../util/mock-providers';
+import { TEXT_CORPUS, commonInputTest } from '../../../util/input-tester';
+
+
+function newInput(): TextInput {
+  const platform = mockPlatform();
+  const config = mockConfig();
+  const app = mockApp(config, platform);
+  const elementRef = mockElementRef();
+  const renderer = mockRenderer();
+  const item: any = mockItem();
+  const form = mockForm();
+  const dom = mockDomController(platform);
+  const input = new TextInput(config, platform, form, app, elementRef, renderer, null, item, null, dom);
+  input._native = mockElementRefEle(document.createElement('input'));
+  return input;
+}
 
 describe('text input', () => {
 
+  it('should pass common test', () => {
+    const textInput = newInput();
+    const ele = textInput._native.nativeElement;
+    textInput._item._elementRef = mockElementRefEle(document.createElement('div'));
+    commonInputTest(textInput, {
+      defaultValue: '',
+      corpus: TEXT_CORPUS,
+      onValueChange: (value) => ele.value === value,
+    });
+
+  });
+
+
   describe('getScrollData', () => {
 
     it('should scroll, top and bottom below safe area, no room to scroll', () => {
diff --git a/src/components/ion.ts b/src/components/ion.ts
index a3bb9a102bb..096850be2b8 100644
--- a/src/components/ion.ts
+++ b/src/components/ion.ts
@@ -1,4 +1,4 @@
-import { ElementRef, Renderer, Input } from '@angular/core';
+import { ElementRef, Input, Renderer } from '@angular/core';
 
 import { Config } from '../config/config';
 
diff --git a/src/components/item/item-reorder-gesture.ts b/src/components/item/item-reorder-gesture.ts
index 374fdf164ff..f3d9df1b428 100644
--- a/src/components/item/item-reorder-gesture.ts
+++ b/src/components/item/item-reorder-gesture.ts
@@ -1,4 +1,4 @@
-import { indexForItem, findReorderItem } from './item-reorder-util';
+import { findReorderItem, indexForItem } from './item-reorder-util';
 import { Platform } from '../../platform/platform';
 import { PointerCoordinates, pointerCoord } from '../../util/dom';
 import { UIEventManager } from '../../gestures/ui-event-manager';
@@ -46,7 +46,7 @@ export class ItemReorderGesture {
     }
     this.reorderList._reorderPrepare();
 
-    let item = reorderMark.getReorderNode();
+    const item = reorderMark.getReorderNode();
     if (!item) {
       console.error('reorder node not found');
       return false;
@@ -71,26 +71,26 @@ export class ItemReorderGesture {
   }
 
   private onDragMove(ev: any) {
-    let selectedItem = this.selectedItemEle;
+    const selectedItem = this.selectedItemEle;
     if (!selectedItem) {
       return;
     }
     ev.preventDefault();
 
     // Get coordinate
-    let coord = pointerCoord(ev);
-    let posY = coord.y;
+    const coord = pointerCoord(ev);
+    const posY = coord.y;
 
     // Scroll if we reach the scroll margins
-    let scrollPosition = this.scroll(posY);
+    const scrollPosition = this.scroll(posY);
 
     // Only perform hit test if we moved at least 30px from previous position
     if (Math.abs(posY - this.lastYcoord) > 30) {
-      let overItem = this.itemForCoord(coord);
+      var overItem = this.itemForCoord(coord);
       if (overItem) {
-        let toIndex = indexForItem(overItem);
+        var toIndex = indexForItem(overItem);
         if (toIndex !== undefined && (toIndex !== this.lastToIndex || this.emptyZone)) {
-          let fromIndex = indexForItem(selectedItem);
+          var fromIndex = indexForItem(selectedItem);
           this.lastToIndex = toIndex;
           this.lastYcoord = posY;
           this.emptyZone = false;
@@ -102,12 +102,12 @@ export class ItemReorderGesture {
     }
 
     // Update selected item position
-    let ydiff = Math.round(posY - this.offset.y + scrollPosition);
+    const ydiff = Math.round(posY - this.offset.y + scrollPosition);
     (<any>selectedItem.style)[this.plt.Css.transform] = `translateY(${ydiff}px)`;
   }
 
   private onDragEnd(ev: any) {
-    let selectedItem = this.selectedItemEle;
+    const selectedItem = this.selectedItemEle;
     if (!selectedItem) {
       return;
     }
@@ -116,9 +116,9 @@ export class ItemReorderGesture {
       ev.stopPropagation();
     }
 
-    let toIndex = this.lastToIndex;
-    let fromIndex = indexForItem(selectedItem);
-    let reorderInactive = () => {
+    const toIndex = this.lastToIndex;
+    const fromIndex = indexForItem(selectedItem);
+    const reorderInactive = () => {
       this.selectedItemEle.style.transition = '';
       this.selectedItemEle.classList.remove(ITEM_REORDER_ACTIVE);
       this.selectedItemEle = null;
@@ -134,7 +134,7 @@ export class ItemReorderGesture {
   }
 
   private itemForCoord(coord: PointerCoordinates): HTMLElement {
-    const sideOffset = this.plt.isRTL ? 100 : -100;
+    const sideOffset = this.reorderList._isStart === this.plt.isRTL ? -100 : 100;
     const x = this.offset.x + sideOffset;
     const y = coord.y;
     const element = this.plt.getElementFromPoint(x, y);
@@ -167,6 +167,7 @@ const SCROLL_JUMP = 10;
 const ITEM_REORDER_ACTIVE = 'reorder-active';
 
 export interface ItemReorderGestureDelegate {
+  _isStart: boolean;
   getNativeElement: () => any;
   _reorderPrepare: () => void;
   _scrollContent: (scrollPosition: number) => number;
diff --git a/src/components/item/item-reorder.scss b/src/components/item/item-reorder.scss
index 1cc415e7cae..45e04bbe636 100644
--- a/src/components/item/item-reorder.scss
+++ b/src/components/item/item-reorder.scss
@@ -1,10 +1,12 @@
 @import "../../themes/ionic.globals";
 
+$reorder-initial-transform: 160% !default;
+
 // Item reorder
 // --------------------------------------------------
 
 ion-reorder {
-  @include transform(translate3d(160%, 0, 0));
+  @include transform(translate3d($reorder-initial-transform, 0, 0));
 
   display: none;
 
@@ -18,13 +20,18 @@ ion-reorder {
   font-size: 1.7em;
   opacity: .25;
 
-
   transition: transform 140ms ease-in;
 
   pointer-events: all;
   touch-action: manipulation;
 }
 
+.reorder-side-start ion-reorder {
+  @include transform(translate3d(-$reorder-initial-transform, 0, 0));
+
+  order: -1;
+}
+
 ion-reorder ion-icon {
   pointer-events: none;
 }
diff --git a/src/components/item/item-reorder.ts b/src/components/item/item-reorder.ts
index 6c90eb45618..09d1ccab159 100644
--- a/src/components/item/item-reorder.ts
+++ b/src/components/item/item-reorder.ts
@@ -1,9 +1,9 @@
-import { Directive, ElementRef, EventEmitter, Input, NgZone, Renderer, Optional, Output } from '@angular/core';
+import { Directive, ElementRef, EventEmitter, Input, NgZone, Optional, Output, Renderer } from '@angular/core';
 
 import { Content } from '../content/content';
 import { DomController } from '../../platform/dom-controller';
 import { isTrueProperty, reorderArray } from '../../util/util';
-import { ItemReorderGestureDelegate, ItemReorderGesture } from './item-reorder-gesture';
+import { ItemReorderGesture, ItemReorderGestureDelegate } from './item-reorder-gesture';
 import { Platform } from '../../platform/platform';
 
 
@@ -142,12 +142,14 @@ export class ReorderIndexes {
   host: {
     '[class.reorder-enabled]': '_enableReorder',
     '[class.reorder-visible]': '_visibleReorder',
+    '[class.reorder-side-start]': '_isStart'
   }
 })
 export class ItemReorder implements ItemReorderGestureDelegate {
 
   _enableReorder: boolean = false;
   _visibleReorder: boolean = false;
+  _isStart: boolean = false;
   _reorderGesture: ItemReorderGesture;
   _lastToIndex: number = -1;
   _element: HTMLElement;
@@ -158,6 +160,14 @@ export class ItemReorder implements ItemReorderGestureDelegate {
    */
   @Output() ionItemReorder: EventEmitter<ReorderIndexes> = new EventEmitter<ReorderIndexes>();
 
+  /**
+   * @input {string} Which side of the view the ion-reorder should be placed. Default `"end"`.
+   */
+  @Input('side')
+  set side(side: 'start' | 'end') {
+    this._isStart = side === 'start';
+  }
+
   constructor(
     private _plt: Platform,
     private _dom: DomController,
@@ -268,7 +278,7 @@ export class ItemReorder implements ItemReorderGestureDelegate {
     /********* DOM WRITE ********* */
     let transform = this._plt.Css.transform;
     if (toIndex >= lastToIndex) {
-      for (var i = lastToIndex; i <= toIndex; i++) {
+      for (let i = lastToIndex; i <= toIndex; i++) {
         if (i !== fromIndex) {
           (<any>children[i]).style[transform] = (i > fromIndex)
             ? `translateY(${-itemHeight}px)` : '';
@@ -277,7 +287,7 @@ export class ItemReorder implements ItemReorderGestureDelegate {
     }
 
     if (toIndex <= lastToIndex) {
-      for (var i = toIndex; i <= lastToIndex; i++) {
+      for (let i = toIndex; i <= lastToIndex; i++) {
         if (i !== fromIndex) {
           (<any>children[i]).style[transform] = (i < fromIndex)
             ? `translateY(${itemHeight}px)` : '';
diff --git a/src/components/item/item-sliding-gesture.ts b/src/components/item/item-sliding-gesture.ts
index 7fdd4205562..afe423ba2f0 100644
--- a/src/components/item/item-sliding-gesture.ts
+++ b/src/components/item/item-sliding-gesture.ts
@@ -1,7 +1,7 @@
 import { ItemSliding } from './item-sliding';
 import { List } from '../list/list';
 import { DomController } from '../../platform/dom-controller';
-import { GestureController, GESTURE_PRIORITY_SLIDING_ITEM, GESTURE_ITEM_SWIPE } from '../../gestures/gesture-controller';
+import { GESTURE_ITEM_SWIPE, GESTURE_PRIORITY_SLIDING_ITEM, GestureController } from '../../gestures/gesture-controller';
 import { PanGesture } from '../../gestures/pan-gesture';
 import { Platform } from '../../platform/platform';
 import { pointerCoord } from '../../util/dom';
diff --git a/src/components/item/item-sliding.ts b/src/components/item/item-sliding.ts
index ecc4a15b883..4773b507a30 100644
--- a/src/components/item/item-sliding.ts
+++ b/src/components/item/item-sliding.ts
@@ -1,6 +1,19 @@
-import { ChangeDetectionStrategy, Component, ContentChildren, ContentChild, ElementRef, EventEmitter, forwardRef, Optional, Output, QueryList, Renderer, ViewEncapsulation, NgZone } from '@angular/core';
-
-import { swipeShouldReset, assert } from '../../util/util';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ContentChild,
+  ContentChildren,
+  ElementRef,
+  EventEmitter,
+  NgZone,
+  Optional,
+  Output,
+  QueryList,
+  Renderer,
+  ViewEncapsulation,
+  forwardRef } from '@angular/core';
+
+import { assert, swipeShouldReset } from '../../util/util';
 import { Item } from './item';
 import { List } from '../list/list';
 import { Platform } from '../../platform/platform';
@@ -266,11 +279,11 @@ export class ItemSliding {
     }
 
     if (openAmount > this._optsWidthRightSide) {
-      var optsWidth = this._optsWidthRightSide;
+      const optsWidth = this._optsWidthRightSide;
       openAmount = optsWidth + (openAmount - optsWidth) * ELASTIC_FACTOR;
 
     } else if (openAmount < -this._optsWidthLeftSide) {
-      var optsWidth = -this._optsWidthLeftSide;
+      const optsWidth = -this._optsWidthLeftSide;
       openAmount = optsWidth + (openAmount - optsWidth) * ELASTIC_FACTOR;
     }
 
@@ -296,8 +309,8 @@ export class ItemSliding {
       restingPoint = 0;
     }
 
-    this._setOpenAmount(restingPoint, true);
     this.fireSwipeEvent();
+    this._setOpenAmount(restingPoint, true);
     return restingPoint;
   }
 
@@ -344,24 +357,24 @@ export class ItemSliding {
 
     if (isFinal) {
       this.item.setElementStyle(platform.Css.transition, '');
+    }
 
-    } else {
-      if (openAmount > 0) {
-        var state = (openAmount >= (this._optsWidthRightSide + SWIPE_MARGIN))
-          ? SlidingState.Right | SlidingState.SwipeRight
-          : SlidingState.Right;
+    if (openAmount > 0) {
+      var state = (openAmount >= (this._optsWidthRightSide + SWIPE_MARGIN))
+        ? SlidingState.Right | SlidingState.SwipeRight
+        : SlidingState.Right;
 
-        this._setState(state);
+      this._setState(state);
 
-      } else if (openAmount < 0) {
-        var state = (openAmount <= (-this._optsWidthLeftSide - SWIPE_MARGIN))
-          ? SlidingState.Left | SlidingState.SwipeLeft
-          : SlidingState.Left;
+    } else if (openAmount < 0) {
+      const state = (openAmount <= (-this._optsWidthLeftSide - SWIPE_MARGIN))
+        ? SlidingState.Left | SlidingState.SwipeLeft
+        : SlidingState.Left;
 
-        this._setState(state);
-      }
-    }
-    if (openAmount === 0) {
+      this._setState(state);
+
+    } else {
+      assert(openAmount === 0, 'bad internal state');
       this._tmr = platform.timeout(() => {
         this._setState(SlidingState.Disabled);
         this._tmr = null;
@@ -371,7 +384,7 @@ export class ItemSliding {
     }
 
     this.item.setElementStyle(platform.Css.transform, `translate3d(${-openAmount}px,0,0)`);
-    let ionDrag = this.ionDrag;
+    const ionDrag = this.ionDrag;
     if (ionDrag.observers.length > 0) {
       ionDrag.emit(this);
     }
diff --git a/src/components/item/item.ts b/src/components/item/item.ts
index 8f5bb710635..87088fba568 100644
--- a/src/components/item/item.ts
+++ b/src/components/item/item.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, ContentChild, ContentChildren, ElementRef, QueryList, Renderer, Optional, ViewChild, ViewEncapsulation } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ContentChild, ContentChildren, ElementRef,  Optional, QueryList, Renderer, ViewChild, ViewEncapsulation } from '@angular/core';
 
 import { Button } from '../button/button';
 import { Config } from '../../config/config';
@@ -323,6 +323,7 @@ export class Item extends Ion {
     this._setName(elementRef);
     this._hasReorder = !!reorder;
     this.id = form.nextId().toString();
+    this.labelId = 'lbl-' + this.id;
 
     // auto add "tappable" attribute to ion-item components that have a click listener
     if (!(<any>renderer).orgListen) {
@@ -391,7 +392,7 @@ export class Item extends Ion {
   set contentLabel(label: Label) {
     if (label) {
       this._label = label;
-      this.labelId = label.id = ('lbl-' + this.id);
+      label.id = this.labelId;
       if (label.type) {
         this.setElementClass('item-label-' + label.type, true);
       }
diff --git a/src/components/item/test/groups/pages/session-list/session-list.ts b/src/components/item/test/groups/pages/session-list/session-list.ts
index 6bce8bc1a8f..a8922f28c55 100644
--- a/src/components/item/test/groups/pages/session-list/session-list.ts
+++ b/src/components/item/test/groups/pages/session-list/session-list.ts
@@ -22,7 +22,7 @@ export class SessionList {
     window.location.reload();
   }
 
-};
+}
 
 
 const data = [
diff --git a/src/components/item/test/inputs/pages/root-page/root-page.html b/src/components/item/test/inputs/pages/root-page/root-page.html
index 43a42fe15b3..982c1e00a0e 100644
--- a/src/components/item/test/inputs/pages/root-page/root-page.html
+++ b/src/components/item/test/inputs/pages/root-page/root-page.html
@@ -20,13 +20,14 @@
     </button>
 
     <ion-item>
-      <ion-label>DateTime</ion-label>
+      <ion-label floating>DateTime</ion-label>
       <ion-datetime [(ngModel)]="datetime" min="1994-03-14" max="2017-12-09" displayFormat="MM/DD/YYYY" required [disabled]='disabled'></ion-datetime>
     </ion-item>
 
     <ion-item>
-      <ion-label>Select</ion-label>
+      <ion-label floating>Select</ion-label>
       <ion-select [(ngModel)]="select" [disabled]='strDisabled()'>
+        <ion-option value="">No Game Console</ion-option>
         <ion-option value="nes">NES</ion-option>
         <ion-option value="n64">Nintendo64</ion-option>
         <ion-option value="ps">PlayStation</ion-option>
@@ -42,7 +43,7 @@
     </ion-item>
 
     <ion-item>
-      <ion-label>Input (text)</ion-label>
+      <ion-label floating>Input (text)</ion-label>
       <ion-input [(ngModel)]="text" [disabled]='disabled'></ion-input>
     </ion-item>
 
diff --git a/src/components/item/test/reorder/pages/root-page/root-page.html b/src/components/item/test/reorder/pages/root-page/root-page.html
index 2252a67f9a5..4138bd6a3ae 100644
--- a/src/components/item/test/reorder/pages/root-page/root-page.html
+++ b/src/components/item/test/reorder/pages/root-page/root-page.html
@@ -13,24 +13,30 @@
 
   <ion-list [reorder]="isReordering" (ionItemReorder)="reorder($event)">
     <button ion-item *ngFor="let item of items" (click)="clickedButton(item)"
-    [style.background]="'rgb('+(255-item*4)+','+(255-item*4)+','+(255-item*4)+')'"
-    [style.min-height]="item*2+35+'px'">
+            [style.background]="'rgb('+(255-item*4)+','+(255-item*4)+','+(255-item*4)+')'"
+            [style.min-height]="item*2+35+'px'">
       {{item}}
     </button>
   </ion-list>
 
-  <ion-list [reorder]="isReordering" (ionItemReorder)="$event.applyTo(items)">
-    <ion-item-sliding *ngFor="let item of items">
-      <button ion-item (click)="clickedButton(item)">
-        <h2>Sliding item {{item}}</h2>
-      </button>
-      <ion-item-options side="right" icon-start>
-        <button ion-button color='danger'>
-          <ion-icon name="trash"></ion-icon>
-          Remove
-        </button>
-      </ion-item-options>
-    </ion-item-sliding>
-  </ion-list>
+  <div *ngFor="let side of ['start', 'end']">
+    <ion-list>
+      <ion-list-header>{{side}}</ion-list-header>
+      <ion-item-group [reorder]="isReordering" (ionItemReorder)="$event.applyTo(items)" [side]="side">
+        <ion-item-sliding *ngFor="let item of items">
+          <button ion-item (click)="clickedButton(item)">
+            <h2>Sliding item {{item}}</h2>
+            <div item-end>right</div>
+          </button>
+          <ion-item-options side="right" icon-start>
+            <button ion-button color='danger'>
+              <ion-icon name="trash"></ion-icon>
+              Remove
+            </button>
+          </ion-item-options>
+        </ion-item-sliding>
+      </ion-item-group>
+    </ion-list>
+  </div>
 
 </ion-content>
diff --git a/src/components/item/test/reorder/pages/root-page/root-page.ts b/src/components/item/test/reorder/pages/root-page/root-page.ts
index 7300c3aa73e..fccd3f61bb2 100644
--- a/src/components/item/test/reorder/pages/root-page/root-page.ts
+++ b/src/components/item/test/reorder/pages/root-page/root-page.ts
@@ -9,7 +9,7 @@ export class RootPage {
   isReordering: boolean = false;
 
   constructor() {
-    let nu = 9;
+    let nu = 5;
     for (let i = 0; i < nu; i++) {
       this.items.push(i);
     }
diff --git a/src/components/item/test/sliding/pages/root-page/root-page.ts b/src/components/item/test/sliding/pages/root-page/root-page.ts
index 7a5602999c7..11685614299 100644
--- a/src/components/item/test/sliding/pages/root-page/root-page.ts
+++ b/src/components/item/test/sliding/pages/root-page/root-page.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild } from '@angular/core';
-import { AlertController, List, ItemSliding, ToastController } from '../../../../../../';
+import { AlertController, ItemSliding, List, ToastController } from '../../../../../../';
 
 @Component({
   templateUrl: 'root-page.html'
@@ -52,7 +52,7 @@ export class RootPage {
     console.log('UNREAD', item);
   }
 
-  didClick(item: ItemSliding) {
+  didClick(_: ItemSliding) {
     console.log('Clicked, ion-item');
 
     let alert = this.alertCtrl.create({
diff --git a/src/components/label/label.ts b/src/components/label/label.ts
index 78d9ba9d6b1..14fff2576a2 100644
--- a/src/components/label/label.ts
+++ b/src/components/label/label.ts
@@ -1,4 +1,4 @@
-import { Attribute, Directive, ElementRef, Renderer, Input } from '@angular/core';
+import { Attribute, Directive, ElementRef, Input, Renderer } from '@angular/core';
 
 import { Config } from '../../config/config';
 import { Ion } from '../ion';
diff --git a/src/components/list/list.md.scss b/src/components/list/list.md.scss
index b4737e2e6c3..54243628b96 100644
--- a/src/components/list/list.md.scss
+++ b/src/components/list/list.md.scss
@@ -87,14 +87,14 @@ $list-md-header-color:           #757575 !default;
 }
 
 .list-md ion-item-options .button {
-  @include margin(1px, 0);
+  @include margin(0);
   @include border-radius(0);
 
   display: inline-flex;
 
   align-items: center;
 
-  height: calc(100% - 2px);
+  height: 100%;
 
   border: 0;
 
diff --git a/src/components/loading/loading-component.ts b/src/components/loading/loading-component.ts
index a278cf60a9c..f50d857eb5b 100644
--- a/src/components/loading/loading-component.ts
+++ b/src/components/loading/loading-component.ts
@@ -1,12 +1,11 @@
 import { Component, ElementRef, HostListener, Renderer, ViewEncapsulation } from '@angular/core';
 
 import { Config } from '../../config/config';
-import { GestureController, BlockerDelegate, BLOCK_ALL } from '../../gestures/gesture-controller';
-import { isDefined, isUndefined, assert } from '../../util/util';
+import { BLOCK_ALL, BlockerDelegate, GestureController } from '../../gestures/gesture-controller';
+import { assert, isDefined, isUndefined } from '../../util/util';
 import { KEY_ESCAPE } from '../../platform/key';
 import { LoadingOptions } from './loading-options';
 import { NavParams } from '../../navigation/nav-params';
-import { Platform } from '../../platform/platform';
 import { ViewController } from '../../navigation/view-controller';
 
 /**
@@ -37,8 +36,7 @@ export class LoadingCmp {
   constructor(
     private _viewCtrl: ViewController,
     private _config: Config,
-    private _plt: Platform,
-    private _elementRef: ElementRef,
+    _elementRef: ElementRef,
     gestureCtrl: GestureController,
     params: NavParams,
     renderer: Renderer
@@ -79,8 +77,6 @@ export class LoadingCmp {
   }
 
   ionViewDidEnter() {
-    this._plt.focusOutActiveElement();
-
     // If there is a duration, dismiss after that amount of time
     if ( this.d && this.d.duration ) {
       this.durationTimeout = setTimeout(() => this.dismiss('backdrop'), this.d.duration);
diff --git a/src/components/loading/loading.ts b/src/components/loading/loading.ts
index c3c61188085..548cfe5967b 100644
--- a/src/components/loading/loading.ts
+++ b/src/components/loading/loading.ts
@@ -4,7 +4,7 @@ import { isPresent } from '../../util/util';
 import { PORTAL_LOADING } from '../app/app-constants';
 import { LoadingCmp } from './loading-component';
 import { LoadingOptions } from './loading-options';
-import { LoadingPopIn, LoadingPopOut, LoadingMdPopIn, LoadingMdPopOut, LoadingWpPopIn, LoadingWpPopOut } from './loading-transitions';
+import { LoadingMdPopIn, LoadingMdPopOut, LoadingPopIn, LoadingPopOut, LoadingWpPopIn, LoadingWpPopOut } from './loading-transitions';
 import { NavOptions } from '../../navigation/nav-util';
 import { ViewController } from '../../navigation/view-controller';
 
diff --git a/src/components/loading/test/basic/app/app.component.ts b/src/components/loading/test/basic/app/app.component.ts
index 24bc0495b2f..a93c05162e5 100644
--- a/src/components/loading/test/basic/app/app.component.ts
+++ b/src/components/loading/test/basic/app/app.component.ts
@@ -12,11 +12,11 @@ export class AppComponent {
   root = PageOne;
 
   constructor(app: App) {
-    app.viewDidLeave.subscribe((ev: any) => {
+    app.viewDidLeave.subscribe((_: any) => {
       console.log('App didLeave');
     });
 
-    app.viewWillLeave.subscribe((ev: any) => {
+    app.viewWillLeave.subscribe((_: any) => {
       console.log('App willLeave');
     });
   }
diff --git a/src/components/menu/menu-gestures.ts b/src/components/menu/menu-gestures.ts
index 72be2da681a..2f0916a3f99 100644
--- a/src/components/menu/menu-gestures.ts
+++ b/src/components/menu/menu-gestures.ts
@@ -1,6 +1,6 @@
 import { Menu } from './menu';
 import { DomController } from '../../platform/dom-controller';
-import { GestureController, GESTURE_PRIORITY_MENU_SWIPE, GESTURE_MENU_SWIPE } from '../../gestures/gesture-controller';
+import { GESTURE_MENU_SWIPE, GESTURE_PRIORITY_MENU_SWIPE, GestureController } from '../../gestures/gesture-controller';
 import { Platform } from '../../platform/platform';
 import { SlideEdgeGesture } from '../../gestures/slide-edge-gesture';
 import { SlideData } from '../../gestures/slide-gesture';
@@ -46,7 +46,7 @@ export class MenuContentGesture extends SlideEdgeGesture {
   }
 
   // Set CSS, then wait one frame for it to apply before sliding starts
-  onSlideBeforeStart(ev: any) {
+  onSlideBeforeStart() {
     console.debug('menu gesture, onSlideBeforeStart', this.menu.side);
     this.menu._swipeBeforeStart();
   }
@@ -56,14 +56,14 @@ export class MenuContentGesture extends SlideEdgeGesture {
     this.menu._swipeStart();
   }
 
-  onSlide(slide: SlideData, ev: any) {
+  onSlide(slide: SlideData) {
     const z = (this.menu.isRightSide !== this.plt.isRTL ? slide.min : slide.max);
     const stepValue = (slide.distance / z);
 
     this.menu._swipeProgress(stepValue);
   }
 
-  onSlideEnd(slide: SlideData, ev: any) {
+  onSlideEnd(slide: SlideData) {
     let z = (this.menu.isRightSide !== this.plt.isRTL ? slide.min : slide.max);
     const currentStepValue = (slide.distance / z);
     const velocity = slide.velocity;
@@ -87,7 +87,7 @@ export class MenuContentGesture extends SlideEdgeGesture {
     this.menu._swipeEnd(shouldCompleteLeft, shouldCompleteRight, currentStepValue, velocity);
   }
 
-  getElementStartPos(slide: SlideData, ev: any) {
+  getElementStartPos(slide: SlideData) {
     const menu = this.menu;
     if (menu.isRightSide !== this.plt.isRTL) {
       return menu.isOpen ? slide.min : slide.max;
diff --git a/src/components/menu/menu-toggle.ts b/src/components/menu/menu-toggle.ts
index 166195b499f..b346beb134a 100644
--- a/src/components/menu/menu-toggle.ts
+++ b/src/components/menu/menu-toggle.ts
@@ -1,4 +1,4 @@
-import { Directive, Input, HostListener, Optional } from '@angular/core';
+import { Directive, HostListener, Input, Optional } from '@angular/core';
 
 import { Button } from '../button/button';
 import { MenuController } from '../app/menu-controller';
@@ -111,7 +111,7 @@ export class MenuToggle {
     private _menu: MenuController,
     @Optional() private _viewCtrl: ViewController,
     @Optional() private _button: Button,
-    @Optional() private _navbar: Navbar
+    @Optional() _navbar: Navbar
   ) {
     this._isButton = !!_button;
     this._inNavbar = !!_navbar;
diff --git a/src/components/menu/menu.ts b/src/components/menu/menu.ts
index 03ba844abe7..4fd8c995e33 100644
--- a/src/components/menu/menu.ts
+++ b/src/components/menu/menu.ts
@@ -1,12 +1,12 @@
-import { OnInit, OnDestroy, ChangeDetectionStrategy, Component, ContentChild, ElementRef, EventEmitter, forwardRef, Input, Output, Renderer, ViewChild, ViewEncapsulation } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ContentChild, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, Renderer, ViewChild, ViewEncapsulation, forwardRef } from '@angular/core';
 
 import { App } from '../app/app';
 import { Backdrop } from '../backdrop/backdrop';
 import { Config } from '../../config/config';
 import { Content } from '../content/content';
 import { DomController } from '../../platform/dom-controller';
-import { GestureController, GESTURE_GO_BACK_SWIPE, BlockerDelegate } from '../../gestures/gesture-controller';
-import { isTrueProperty, Side, isRightSide, assert } from '../../util/util';
+import { BlockerDelegate, GESTURE_GO_BACK_SWIPE, GestureController,  } from '../../gestures/gesture-controller';
+import { Side, assert, isRightSide, isTrueProperty } from '../../util/util';
 import { Keyboard } from '../../platform/keyboard';
 import { MenuContentGesture } from  './menu-gestures';
 import { Menu as MenuInterface } from '../app/menu-interface';
@@ -25,7 +25,7 @@ import { RootNode } from '../split-pane/split-pane';
  * will be displayed differently based on the mode, however the display type can be changed
  * to any of the available [menu types](#menu-types). The menu element should be a sibling
  * to the app's content element. There can be any number of menus attached to the content.
- * These can be controlled from the templates, or programmatically using the [MenuController](../app/MenuController).
+ * These can be controlled from the templates, or programmatically using the [MenuController](../../app/MenuController).
  *
  * @usage
  *
diff --git a/src/components/menu/test/enable-disable/app.module.ts b/src/components/menu/test/enable-disable/app.module.ts
index b1e63043609..db74a3d49ac 100644
--- a/src/components/menu/test/enable-disable/app.module.ts
+++ b/src/components/menu/test/enable-disable/app.module.ts
@@ -1,6 +1,6 @@
-import { Component, ViewChild, NgModule } from '@angular/core';
+import { Component, NgModule, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, App, MenuController, Nav } from '../../../..';
+import { App, IonicApp, IonicModule, MenuController, Nav } from '../../../..';
 
 
 @Component({
diff --git a/src/components/menu/test/overlay/app.module.ts b/src/components/menu/test/overlay/app.module.ts
index e49268830d9..b87e64e7579 100644
--- a/src/components/menu/test/overlay/app.module.ts
+++ b/src/components/menu/test/overlay/app.module.ts
@@ -1,6 +1,6 @@
-import { Component, ViewChild, NgModule } from '@angular/core';
+import { Component, NgModule, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, Nav, AlertController } from '../../../..';
+import { AlertController, IonicApp, IonicModule, Nav } from '../../../..';
 
 
 @Component({templateUrl: 'page1.html'})
diff --git a/src/components/menu/test/push/app.module.ts b/src/components/menu/test/push/app.module.ts
index e49268830d9..b87e64e7579 100644
--- a/src/components/menu/test/push/app.module.ts
+++ b/src/components/menu/test/push/app.module.ts
@@ -1,6 +1,6 @@
-import { Component, ViewChild, NgModule } from '@angular/core';
+import { Component, NgModule, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, Nav, AlertController } from '../../../..';
+import { AlertController, IonicApp, IonicModule, Nav } from '../../../..';
 
 
 @Component({templateUrl: 'page1.html'})
diff --git a/src/components/menu/test/reveal/app.module.ts b/src/components/menu/test/reveal/app.module.ts
index 9c6a4dab454..3acf38e37c3 100644
--- a/src/components/menu/test/reveal/app.module.ts
+++ b/src/components/menu/test/reveal/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, NgModule } from '@angular/core';
+import { Component, NgModule, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, Nav } from '../../../..';
 
diff --git a/src/components/modal/modal-component.ts b/src/components/modal/modal-component.ts
index f87b158f5ce..50955a736b2 100644
--- a/src/components/modal/modal-component.ts
+++ b/src/components/modal/modal-component.ts
@@ -4,7 +4,7 @@ import { KEY_ESCAPE } from '../../platform/key';
 import { NavParams } from '../../navigation/nav-params';
 import { NavOptions } from '../../navigation/nav-util';
 import { ViewController } from '../../navigation/view-controller';
-import { GestureController, BlockerDelegate, GESTURE_MENU_SWIPE, GESTURE_GO_BACK_SWIPE } from '../../gestures/gesture-controller';
+import { BlockerDelegate, GESTURE_GO_BACK_SWIPE, GESTURE_MENU_SWIPE,  GestureController } from '../../gestures/gesture-controller';
 import { ModuleLoader } from '../../util/module-loader';
 import { assert } from '../../util/util';
 
diff --git a/src/components/modal/modal-impl.ts b/src/components/modal/modal-impl.ts
index ec40e151562..58502b91236 100644
--- a/src/components/modal/modal-impl.ts
+++ b/src/components/modal/modal-impl.ts
@@ -4,7 +4,7 @@ import { isPresent } from '../../util/util';
 import { PORTAL_MODAL } from '../app/app-constants';
 import { ModalCmp } from './modal-component';
 import { ModalOptions } from './modal-options';
-import { ModalSlideIn, ModalSlideOut, ModalMDSlideIn, ModalMDSlideOut } from './modal-transitions';
+import { ModalMDSlideIn, ModalMDSlideOut, ModalSlideIn, ModalSlideOut } from './modal-transitions';
 import { NavOptions } from '../../navigation/nav-util';
 import { ViewController } from '../../navigation/view-controller';
 
diff --git a/src/components/modal/test/basic/app/app.module.ts b/src/components/modal/test/basic/app/app.module.ts
index ec89d90fe7e..92c32cc5d33 100644
--- a/src/components/modal/test/basic/app/app.module.ts
+++ b/src/components/modal/test/basic/app/app.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicModule, IonicApp } from '../../../../..';
+import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
 import { PageOneModule } from '../pages/page-one/page-one.module';
diff --git a/src/components/modal/test/basic/pages/page-one/page-one.ts b/src/components/modal/test/basic/pages/page-one/page-one.ts
index 545c68ca9a6..146de97a57e 100644
--- a/src/components/modal/test/basic/pages/page-one/page-one.ts
+++ b/src/components/modal/test/basic/pages/page-one/page-one.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { Config, IonicPage, NavController, ModalController, ToastController, Platform } from '../../../../../..';
+import { Config, IonicPage, ModalController, NavController, Platform, ToastController } from '../../../../../..';
 
 @IonicPage()
 @Component({
diff --git a/src/components/modal/test/basic/pages/page-two/page-two.ts b/src/components/modal/test/basic/pages/page-two/page-two.ts
index 64e111fb32a..8fdb41fd8d3 100644
--- a/src/components/modal/test/basic/pages/page-two/page-two.ts
+++ b/src/components/modal/test/basic/pages/page-two/page-two.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { App, ActionSheetController, AlertController, IonicPage, ModalController, NavController, ToastController } from '../../../../../..';
+import { ActionSheetController, AlertController, App, IonicPage, ModalController, NavController, ToastController } from '../../../../../..';
 
 @IonicPage()
 @Component({
diff --git a/src/components/nav/nav.ts b/src/components/nav/nav.ts
index c9c5c5a75a3..46d5fe0ba59 100644
--- a/src/components/nav/nav.ts
+++ b/src/components/nav/nav.ts
@@ -1,11 +1,10 @@
-import { AfterViewInit, Component, ComponentFactoryResolver, ElementRef, ErrorHandler, forwardRef, Input, Optional, NgZone, Renderer, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core';
+import { AfterViewInit, Component, ComponentFactoryResolver, ElementRef, ErrorHandler, Input, NgZone, Optional, Renderer, ViewChild, ViewContainerRef, ViewEncapsulation, forwardRef } from '@angular/core';
 
 import { App } from '../app/app';
 import { Config } from '../../config/config';
 import { DeepLinker } from '../../navigation/deep-linker';
 import { DomController } from '../../platform/dom-controller';
 import { GestureController } from '../../gestures/gesture-controller';
-import { Keyboard } from '../../platform/keyboard';
 import { Nav as INav } from '../../navigation/nav-interfaces';
 import { NavController } from '../../navigation/nav-controller';
 import { NavControllerBase } from '../../navigation/nav-controller-base';
@@ -66,7 +65,6 @@ export class Nav extends NavControllerBase implements AfterViewInit, RootNode, I
     app: App,
     config: Config,
     plt: Platform,
-    keyboard: Keyboard,
     elementRef: ElementRef,
     zone: NgZone,
     renderer: Renderer,
@@ -77,7 +75,7 @@ export class Nav extends NavControllerBase implements AfterViewInit, RootNode, I
     domCtrl: DomController,
     errHandler: ErrorHandler
   ) {
-    super(parent, app, config, plt, keyboard, elementRef, zone, renderer, cfr, gestureCtrl, transCtrl, linker, domCtrl, errHandler);
+    super(parent, app, config, plt, elementRef, zone, renderer, cfr, gestureCtrl, transCtrl, linker, domCtrl, errHandler);
 
     if (viewCtrl) {
       // an ion-nav can also act as an ion-page within a parent ion-nav
@@ -94,10 +92,10 @@ export class Nav extends NavControllerBase implements AfterViewInit, RootNode, I
       this.parent = viewCtrl.getNav();
       this.parent.registerChildNav(this);
 
-    } else if (app && !app.getRootNav()) {
+    } else if (app && !app.getRootNavById(this.id)) {
       // a root nav has not been registered yet with the app
       // this is the root navcontroller for the entire app
-      app._setRootNav(this);
+      app.registerRootNav(this);
     }
   }
 
@@ -112,25 +110,22 @@ export class Nav extends NavControllerBase implements AfterViewInit, RootNode, I
   ngAfterViewInit() {
     this._hasInit = true;
 
-    let navSegment = this._linker.initNav(this);
-    if (navSegment && (navSegment.component || navSegment.loadChildren)) {
-      // there is a segment match in the linker
-      return this._linker.initViews(navSegment).then(views => {
-        this.setPages(views, null, null);
-      });
+    const segment = this._linker.getSegmentByNavIdOrName(this.id, this.name);
 
+    if (segment && (segment.component || segment.loadChildren)) {
+      return this._linker.initViews(segment).then(views => {
+        return this.setPages(views, null, null);
+      });
     } else if (this._root) {
-      // no segment match, so use the root property
+      // no segment match, so use the root property but don't set the url I guess
+      const setUrl = segment ? false : true;
       return this.push(this._root, this.rootParams, {
-        isNavRoot: (<any>this._app.getRootNav() === this)
+        isNavRoot: (<any>this._app.getRootNavById(this.id) === this),
+        updateUrl: setUrl
       }, null);
     }
   }
 
-  goToRoot(opts: NavOptions) {
-    return this.setRoot(this._root, this.rootParams, opts, null);
-  }
-
   /**
    * @input {Page} The Page component to load as the root page within this nav.
    */
@@ -138,6 +133,7 @@ export class Nav extends NavControllerBase implements AfterViewInit, RootNode, I
   get root(): any {
     return this._root;
   }
+
   set root(page: any) {
     this._root = page;
 
@@ -151,6 +147,11 @@ export class Nav extends NavControllerBase implements AfterViewInit, RootNode, I
    */
   @Input() rootParams: any;
 
+  /**
+   * @input {string} a unique name for the nav element
+   */
+  @Input() name: string;
+
   /**
    * @hidden
    */
@@ -169,4 +170,21 @@ export class Nav extends NavControllerBase implements AfterViewInit, RootNode, I
     }
   }
 
+  goToRoot(opts: NavOptions) {
+    return this.setRoot(this._root, this.rootParams, opts, null);
+  }
+
+  /*
+   * @private
+   */
+  getType() {
+    return 'nav';
+  }
+
+  /*
+   * @private
+   */
+  getSecondaryIdentifier(): string {
+    return null;
+  }
 }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/app/app.component.ts b/src/components/nav/test/advanced-nav-then-tabs/app/app.component.ts
new file mode 100644
index 00000000000..f18c526c213
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/app/app.component.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+
+@Component({
+  template: `
+<ion-split-pane>
+  <ion-nav [root]="rootOne" name="left"></ion-nav>
+  <ion-nav [root]="rootTwo" main #content name="right"></ion-nav>
+
+</ion-split-pane>
+  `
+})
+export class AppComponent {
+  rootOne = 'NestedNavOnePageTwo';
+  rootTwo = 'NestedNavTwoPageTwo';
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/app/app.module.ts b/src/components/nav/test/advanced-nav-then-tabs/app/app.module.ts
new file mode 100644
index 00000000000..55310fa2157
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/app/app.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent, { swipeBackEnabled: true, preloadModules: true }),
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/app/main.ts b/src/components/nav/test/advanced-nav-then-tabs/app/main.ts
new file mode 100644
index 00000000000..6af7a5b2ae8
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/app/main.ts
@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-one/nested-nav-one-page-one.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-one/nested-nav-one-page-one.module.ts
new file mode 100644
index 00000000000..2ac5c3f2b3d
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-one/nested-nav-one-page-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { NestedNavOnePageOne } from './nested-nav-one-page-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(NestedNavOnePageOne)
+  ],
+  declarations: [
+    NestedNavOnePageOne
+  ]
+})
+export class NestedNavOnePageOneModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-one/nested-nav-one-page-one.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-one/nested-nav-one-page-one.ts
new file mode 100644
index 00000000000..1d7771ebc4d
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-one/nested-nav-one-page-one.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-nav [root]="root"></ion-nav>
+  `
+})
+export class NestedNavOnePageOne {
+
+  root: string = 'NestedNavOnePageTwo';
+  constructor(public nav: NavController) {
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-one/nested-nav-one-page-two.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-one/nested-nav-one-page-two.module.ts
new file mode 100644
index 00000000000..63d257e8bee
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-one/nested-nav-one-page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { NestedNavOnePageTwo } from './nested-nav-one-page-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(NestedNavOnePageTwo)
+  ],
+  declarations: [
+    NestedNavOnePageTwo
+  ]
+})
+export class NestedNavOnePageTwoModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-one/nested-nav-one-page-two.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-one/nested-nav-one-page-two.ts
new file mode 100644
index 00000000000..4ad479e4a91
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-one/nested-nav-one-page-two.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-nav [root]="root"></ion-nav>
+  `
+})
+export class NestedNavOnePageTwo {
+
+  root: string = 'NonTabOne';
+  constructor(public nav: NavController) {
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-two/nested-nav-two-page-one.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-two/nested-nav-two-page-one.module.ts
new file mode 100644
index 00000000000..3ba0db08a72
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-two/nested-nav-two-page-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { NestedNavTwoPageOne } from './nested-nav-two-page-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(NestedNavTwoPageOne)
+  ],
+  declarations: [
+    NestedNavTwoPageOne
+  ]
+})
+export class NestedNavTwoPageOneModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-two/nested-nav-two-page-one.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-two/nested-nav-two-page-one.ts
new file mode 100644
index 00000000000..fce22b70bc4
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-two/nested-nav-two-page-one.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-nav [root]="root"></ion-nav>
+  `
+})
+export class NestedNavTwoPageOne {
+
+  root: string = 'NestedNavTwoPageTwo';
+  constructor(public nav: NavController) {
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-two/nested-nav-two-page-two.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-two/nested-nav-two-page-two.module.ts
new file mode 100644
index 00000000000..cdcbd02b225
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-two/nested-nav-two-page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { NestedNavTwoPageTwo } from './nested-nav-two-page-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(NestedNavTwoPageTwo)
+  ],
+  declarations: [
+    NestedNavTwoPageTwo
+  ]
+})
+export class NestedNavTwoPageTwoModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-two/nested-nav-two-page-two.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-two/nested-nav-two-page-two.ts
new file mode 100644
index 00000000000..55543c7a0b3
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/nested-nav-two/nested-nav-two-page-two.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-nav [root]="root"></ion-nav>
+  `
+})
+export class NestedNavTwoPageTwo {
+
+  root: string = 'NonTabTwo';
+  constructor(public nav: NavController) {
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/non-tab-one/non-tab-one.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/non-tab-one/non-tab-one.module.ts
new file mode 100644
index 00000000000..aad981bb965
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/non-tab-one/non-tab-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { NonTabOne } from './non-tab-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(NonTabOne)
+  ],
+  declarations: [
+    NonTabOne
+  ]
+})
+export class NonTabOneModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/non-tab-one/non-tab-one.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/non-tab-one/non-tab-one.ts
new file mode 100644
index 00000000000..e6841a9113b
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/non-tab-one/non-tab-one.ts
@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-header>
+      <ion-navbar>
+        <ion-title>Nav One</ion-title>
+      </ion-navbar>
+    </ion-header>
+    <ion-content>
+      Nav 1 Page 1
+      <button ion-button (click)="goToTabs()">Go to Tabs 1</button>
+    </ion-content>
+  `
+})
+export class NonTabOne {
+
+  constructor(public nav: NavController) {
+  }
+
+  goToTabs() {
+    this.nav.push('TabsOnePage');
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/non-tab-two/non-tab-two.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/non-tab-two/non-tab-two.module.ts
new file mode 100644
index 00000000000..592f7607b68
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/non-tab-two/non-tab-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { NonTabTwo } from './non-tab-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(NonTabTwo)
+  ],
+  declarations: [
+    NonTabTwo
+  ]
+})
+export class NonTabTwoModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/non-tab-two/non-tab-two.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/non-tab-two/non-tab-two.ts
new file mode 100644
index 00000000000..13eda66fd52
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/non-tab-two/non-tab-two.ts
@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-header>
+      <ion-navbar>
+        <ion-title>Nav Two</ion-title>
+      </ion-navbar>
+    </ion-header>
+    <ion-content>
+      Nav 2 Page 1
+      <button ion-button (click)="goToTabs()">Go to Tabs 2</button>
+    </ion-content>
+  `
+})
+export class NonTabTwo {
+  constructor(public nav: NavController) {
+  }
+
+  goToTabs() {
+    this.nav.push('TabsTwoPage');
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-one/tab-one-page-one.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-one/tab-one-page-one.module.ts
new file mode 100644
index 00000000000..4559ff52d8a
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-one/tab-one-page-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOneTabOnePageOne } from './tab-one-page-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOneTabOnePageOne)
+  ],
+  declarations: [
+    TabsOneTabOnePageOne
+  ]
+})
+export class TabsOneTabOnePageOneModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-one/tab-one-page-one.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-one/tab-one-page-one.ts
new file mode 100644
index 00000000000..be96dffa3e0
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-one/tab-one-page-one.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOneTabOnePageOne'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 1 Tab 1 Page 1</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 1 Tab 1 Page 1
+  <button ion-button (click)="nextPage()">Go to Next Page</button>
+</ion-content>
+  `
+})
+export class TabsOneTabOnePageOne {
+  constructor(public nav: NavController) {
+  }
+
+  nextPage() {
+    this.nav.push('TabsOneTabOnePageTwo', { userId: '123', name: 'Andy Bernard'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-three/tab-one-page-three.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-three/tab-one-page-three.module.ts
new file mode 100644
index 00000000000..72b667bef42
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-three/tab-one-page-three.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOneTabOnePageThree } from './tab-one-page-three';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOneTabOnePageThree)
+  ],
+  declarations: [
+    TabsOneTabOnePageThree
+  ]
+})
+export class TabsOneTabOnePageThreeModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-three/tab-one-page-three.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-three/tab-one-page-three.ts
new file mode 100644
index 00000000000..5deb7fc0689
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-three/tab-one-page-three.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOneTabOnePageThree/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 1 Tab 1 Page 3</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 1 Tab 1 Page 3
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+  Name: {{paramTwo}}
+  </div>
+</ion-content>
+  `
+})
+export class TabsOneTabOnePageThree {
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.paramOne = navParams.data.paramOne;
+    this.paramTwo = navParams.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-two/tab-one-page-two.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-two/tab-one-page-two.module.ts
new file mode 100644
index 00000000000..814d2c99e19
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-two/tab-one-page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOneTabOnePageTwo } from './tab-one-page-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOneTabOnePageTwo)
+  ],
+  declarations: [
+    TabsOneTabOnePageTwo
+  ]
+})
+export class TabsOneTabOnePageTwoModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-two/tab-one-page-two.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-two/tab-one-page-two.ts
new file mode 100644
index 00000000000..8839b6dfda8
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-one-page-two/tab-one-page-two.ts
@@ -0,0 +1,37 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOneTabOnePageTwo/userId/:userId/name/:name'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 1 Tab 1 Page 2</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 1 Tab 1 Page 2
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name: {{name}}
+  </div>
+  <button ion-button (click)="goToNext()">Next</button>
+</ion-content>
+  `
+})
+export class TabsOneTabOnePageTwo {
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.userId = navParams.data.userId;
+    this.name = navParams.data.name;
+  }
+
+  goToNext() {
+    this.nav.push('TabsOneTabOnePageThree', { paramOne: 'Scranton', paramTwo: 'PA'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-one/tab-two-page-one.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-one/tab-two-page-one.module.ts
new file mode 100644
index 00000000000..56352b8d939
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-one/tab-two-page-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOneTabTwoPageOne } from './tab-two-page-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOneTabTwoPageOne)
+  ],
+  declarations: [
+    TabsOneTabTwoPageOne
+  ]
+})
+export class TabsOneTabTwoPageOneModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-one/tab-two-page-one.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-one/tab-two-page-one.ts
new file mode 100644
index 00000000000..70ebb507b89
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-one/tab-two-page-one.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOneTabTwoPageOne'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 1 Tab 2 Page 1</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 1 Tab 2 Page 1
+  <button ion-button (click)="nextPage()">Go to Next Page</button>
+</ion-content>
+  `
+})
+export class TabsOneTabTwoPageOne {
+  constructor(public nav: NavController) {
+  }
+
+  nextPage() {
+    this.nav.push('TabsOneTabTwoPageTwo', { userId: '456', name: 'Stanley Hudson'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-three/tab-two-page-three.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-three/tab-two-page-three.module.ts
new file mode 100644
index 00000000000..356be3a980f
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-three/tab-two-page-three.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOneTabTwoPageThree } from './tab-two-page-three';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOneTabTwoPageThree)
+  ],
+  declarations: [
+    TabsOneTabTwoPageThree
+  ]
+})
+export class TabsOneTabTwoPageThreeModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-three/tab-two-page-three.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-three/tab-two-page-three.ts
new file mode 100644
index 00000000000..1095975b5c4
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-three/tab-two-page-three.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOneTabTwoPageThree/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 1 Tab 2 Page 3</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 1 Tab 2 Page 3
+  <div>
+  Param One: {{userId}}
+  </div>
+  <div>
+  Param Two: {{name}}
+  </div>
+</ion-content>
+  `
+})
+export class TabsOneTabTwoPageThree {
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.paramOne = navParams.data.paramOne;
+    this.paramTwo = navParams.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-two/tab-two-page-two.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-two/tab-two-page-two.module.ts
new file mode 100644
index 00000000000..493f9e41b5a
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-two/tab-two-page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOneTabTwoPageTwo } from './tab-two-page-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOneTabTwoPageTwo)
+  ],
+  declarations: [
+    TabsOneTabTwoPageTwo
+  ]
+})
+export class TabsOneTabTwoPageTwoModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-two/tab-two-page-two.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-two/tab-two-page-two.ts
new file mode 100644
index 00000000000..8f213c8518c
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tab-two-page-two/tab-two-page-two.ts
@@ -0,0 +1,37 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOneTabTwoPageTwo/userId/:userId/name/:name'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 1 Tab 2 Page 2</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 1 Tab 2 Page 2
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name: {{name}}
+  </div>
+  <button ion-button (click)="goToNext()">Next</button>
+</ion-content>
+  `
+})
+export class TabsOneTabTwoPageTwo {
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.userId = navParams.data.userId;
+    this.name = navParams.data.name;
+  }
+
+  goToNext() {
+    this.nav.push('TabsOneTabTwoPageThree', { paramOne: 'Nashua', paramTwo: 'NH'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tabs-one-page/tabs-one-page.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tabs-one-page/tabs-one-page.module.ts
new file mode 100644
index 00000000000..ae8f5fd3336
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tabs-one-page/tabs-one-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOnePage } from './tabs-one-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOnePage)
+  ],
+  declarations: [
+    TabsOnePage
+  ]
+})
+export class TabsOnePageModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tabs-one-page/tabs-one-page.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tabs-one-page/tabs-one-page.ts
new file mode 100644
index 00000000000..016a410c6c8
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-one/tabs-one-page/tabs-one-page.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOnePage'
+})
+@Component({
+  template: `
+<ion-tabs>
+  <ion-tab tabIcon="heart" [root]="tabs1Tab1" tabTitle="Heart"></ion-tab>
+  <ion-tab tabIcon="star" [root]="tabs1Tab2" tabTitle="Star"></ion-tab>
+</ion-tabs>
+  `
+})
+export class TabsOnePage {
+
+  tabs1Tab1: string = 'TabsOneTabOnePageOne';
+  tabs1Tab2: string = 'TabsOneTabTwoPageOne';
+  constructor(public nav: NavController) {
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-one/tab-one-page-one.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-one/tab-one-page-one.module.ts
new file mode 100644
index 00000000000..e6cef890720
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-one/tab-one-page-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoTabOnePageOne } from './tab-one-page-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoTabOnePageOne)
+  ],
+  declarations: [
+    TabsTwoTabOnePageOne
+  ]
+})
+export class TabsTwoTabOnePageOneModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-one/tab-one-page-one.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-one/tab-one-page-one.ts
new file mode 100644
index 00000000000..6a0608474b2
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-one/tab-one-page-one.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoTabOnePageOne'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 2 Tab 1 Page 1</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 2 Tab 1 Page 1
+  <button ion-button (click)="nextPage()">Go to Next Page</button>
+</ion-content>
+  `
+})
+export class TabsTwoTabOnePageOne {
+  constructor(public nav: NavController) {
+  }
+
+  nextPage() {
+    this.nav.push('TabsTwoTabOnePageTwo', { userId: '234', name: 'Phillis Vance - Vance Refridgeration'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-three/tab-one-page-three.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-three/tab-one-page-three.module.ts
new file mode 100644
index 00000000000..51e8d257f6d
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-three/tab-one-page-three.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoTabOnePageThree } from './tab-one-page-three';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoTabOnePageThree)
+  ],
+  declarations: [
+    TabsTwoTabOnePageThree
+  ]
+})
+export class TabsTwoTabOnePageThreeModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-three/tab-one-page-three.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-three/tab-one-page-three.ts
new file mode 100644
index 00000000000..b84f6b9feff
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-three/tab-one-page-three.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoTabOnePageThree/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 2 Tab 1 Page 3</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 2 Tab 1 Page 3
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+  Param Two: {{paramTwo}}
+  </div>
+</ion-content>
+  `
+})
+export class TabsTwoTabOnePageThree {
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.paramOne = navParams.data.paramOne;
+    this.paramTwo = navParams.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-two/tab-one-page-two.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-two/tab-one-page-two.module.ts
new file mode 100644
index 00000000000..d9518047a08
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-two/tab-one-page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoTabOnePageTwo } from './tab-one-page-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoTabOnePageTwo)
+  ],
+  declarations: [
+    TabsTwoTabOnePageTwo
+  ]
+})
+export class TabsTwoTabOnePageTwoModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-two/tab-one-page-two.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-two/tab-one-page-two.ts
new file mode 100644
index 00000000000..fbaf3cd90a0
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-one-page-two/tab-one-page-two.ts
@@ -0,0 +1,37 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoTabOnePageTwo/userId/:userId/name/:name'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 2 Tab 1 Page 2</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 2 Tab 1 Page 2
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name: {{name}}
+  </div>
+  <button ion-button (click)="goToNext()">Next</button>
+</ion-content>
+  `
+})
+export class TabsTwoTabOnePageTwo {
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.userId = navParams.data.userId;
+    this.name = navParams.data.name;
+  }
+
+  goToNext() {
+    this.nav.push('TabsTwoTabOnePageThree', { paramOne: 'Stamford', paramTwo: 'CT'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-one/tab-two-page-one.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-one/tab-two-page-one.module.ts
new file mode 100644
index 00000000000..0e21ef3d25a
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-one/tab-two-page-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoTabTwoPageOne } from './tab-two-page-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoTabTwoPageOne)
+  ],
+  declarations: [
+    TabsTwoTabTwoPageOne
+  ]
+})
+export class TabsTwoTabTwoPageOneModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-one/tab-two-page-one.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-one/tab-two-page-one.ts
new file mode 100644
index 00000000000..cc13a9e116d
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-one/tab-two-page-one.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoTabTwoPageOne'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 2 Tab 2 Page 1</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 2 Tab 2 Page 1
+  <button ion-button (click)="nextPage()">Go to Next Page</button>
+</ion-content>
+  `
+})
+export class TabsTwoTabTwoPageOne {
+  constructor(public nav: NavController) {
+  }
+
+  nextPage() {
+    this.nav.push('TabsTwoTabTwoPageTwo', { userId: '456', name: 'Michael Scarn'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-three/tab-two-page-three.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-three/tab-two-page-three.module.ts
new file mode 100644
index 00000000000..0f4524411a8
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-three/tab-two-page-three.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoTabTwoPageThree } from './tab-two-page-three';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoTabTwoPageThree)
+  ],
+  declarations: [
+    TabsTwoTabTwoPageThree
+  ]
+})
+export class TabsTwoTabTwoPageThreeModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-three/tab-two-page-three.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-three/tab-two-page-three.ts
new file mode 100644
index 00000000000..41ab0873ec1
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-three/tab-two-page-three.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoTabTwoPageThree/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 2 Tab 2 Page 3</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 2 Tab 2 Page 3
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+  Param Two: {{paramTwo}}
+  </div>
+</ion-content>
+  `
+})
+export class TabsTwoTabTwoPageThree {
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.paramOne = navParams.data.paramOne;
+    this.paramTwo = navParams.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-two/tab-two-page-two.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-two/tab-two-page-two.module.ts
new file mode 100644
index 00000000000..bdbddc50cde
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-two/tab-two-page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoTabTwoPageTwo } from './tab-two-page-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoTabTwoPageTwo)
+  ],
+  declarations: [
+    TabsTwoTabTwoPageTwo
+  ]
+})
+export class TabsTwoTabTwoPageTwoModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-two/tab-two-page-two.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-two/tab-two-page-two.ts
new file mode 100644
index 00000000000..7d7c10dd1b2
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tab-two-page-two/tab-two-page-two.ts
@@ -0,0 +1,37 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoTabTwoPageTwo/userId/:userId/name/:name'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 2 Tab 2 Page 2</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 2 Tab 2 Page 2
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name: {{name}}
+  </div>
+  <button ion-button (click)="next()">Next</button>
+</ion-content>
+  `
+})
+export class TabsTwoTabTwoPageTwo {
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.userId = navParams.data.userId;
+    this.name = navParams.data.name;
+  }
+
+  next() {
+    this.nav.push('TabsTwoTabTwoPageThree', { paramOne: 'Albany', paramTwo: 'NY'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tabs-two-page/tabs-two-page.module.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tabs-two-page/tabs-two-page.module.ts
new file mode 100644
index 00000000000..31ada2039c4
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tabs-two-page/tabs-two-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoPage } from './tabs-two-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoPage)
+  ],
+  declarations: [
+    TabsTwoPage
+  ]
+})
+export class TabsTwoPageModule { }
diff --git a/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tabs-two-page/tabs-two-page.ts b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tabs-two-page/tabs-two-page.ts
new file mode 100644
index 00000000000..6dfea3dde05
--- /dev/null
+++ b/src/components/nav/test/advanced-nav-then-tabs/pages/tabs-two/tabs-two-page/tabs-two-page.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoPage'
+})
+@Component({
+  template: `
+<ion-tabs>
+    <ion-tab tabIcon="aperture" [root]="tabs2Tab1" tabTitle="Aperture"></ion-tab>
+    <ion-tab tabIcon="apps" [root]="tabs2Tab2" tabTitle="Apps"></ion-tab>
+  </ion-tabs>
+  `
+})
+export class TabsTwoPage {
+
+  tabs2Tab1: string = 'TabsTwoTabOnePageOne';
+  tabs2Tab2: string = 'TabsTwoTabTwoPageOne';
+  constructor(public nav: NavController) {
+  }
+}
diff --git a/src/components/nav/test/advanced-nav/app/app.component.ts b/src/components/nav/test/advanced-nav/app/app.component.ts
new file mode 100644
index 00000000000..2eeeb636c65
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/app/app.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+
+@Component({
+  template: `
+<ion-split-pane>
+  <ion-nav [root]="root"></ion-nav>
+  <ion-nav [root]="root2" main #content></ion-nav>
+</ion-split-pane>
+  `
+})
+export class AppComponent {
+  root = 'FirstPage';
+  root2 = 'FourthPage';
+}
diff --git a/src/components/nav/test/advanced-nav/app/app.module.ts b/src/components/nav/test/advanced-nav/app/app.module.ts
new file mode 100644
index 00000000000..55310fa2157
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/app/app.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent, { swipeBackEnabled: true, preloadModules: true }),
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
diff --git a/src/components/nav/test/advanced-nav/app/main.ts b/src/components/nav/test/advanced-nav/app/main.ts
new file mode 100644
index 00000000000..6af7a5b2ae8
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/app/main.ts
@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/components/nav/test/advanced-nav/pages/left/first-page/first-page.html b/src/components/nav/test/advanced-nav/pages/left/first-page/first-page.html
new file mode 100644
index 00000000000..e82b2f23889
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/left/first-page/first-page.html
@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page One</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Page One</h2>
+  <button ion-button (click)="goToPageTwo()">Go to Page Two</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/advanced-nav/pages/left/first-page/first-page.module.ts b/src/components/nav/test/advanced-nav/pages/left/first-page/first-page.module.ts
new file mode 100644
index 00000000000..c17e0dde59e
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/left/first-page/first-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FirstPage } from './first-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FirstPage)
+  ],
+  declarations: [
+    FirstPage
+  ]
+})
+export class FirstPageModule { }
diff --git a/src/components/nav/test/advanced-nav/pages/left/first-page/first-page.ts b/src/components/nav/test/advanced-nav/pages/left/first-page/first-page.ts
new file mode 100644
index 00000000000..027607bc6d0
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/left/first-page/first-page.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'first-page.html'
+})
+export class FirstPage {
+  constructor(public nav: NavController) {
+  }
+
+  goToPageTwo() {
+    this.nav.push('SecondPage', { userId: '123', name: 'Michael Scott'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nav/pages/left/second-page/second-page.html b/src/components/nav/test/advanced-nav/pages/left/second-page/second-page.html
new file mode 100644
index 00000000000..39d1124a079
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/left/second-page/second-page.html
@@ -0,0 +1,15 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Two</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Page Two</h2>
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name {{name}}
+  </div>
+  <button ion-button (click)="goToNextPage()">Go to Next</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/advanced-nav/pages/left/second-page/second-page.module.ts b/src/components/nav/test/advanced-nav/pages/left/second-page/second-page.module.ts
new file mode 100644
index 00000000000..ce824037f89
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/left/second-page/second-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { SecondPage } from './second-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SecondPage)
+  ],
+  declarations: [
+    SecondPage
+  ]
+})
+export class SecondPageModule { }
diff --git a/src/components/nav/test/advanced-nav/pages/left/second-page/second-page.ts b/src/components/nav/test/advanced-nav/pages/left/second-page/second-page.ts
new file mode 100644
index 00000000000..44abf580fe3
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/left/second-page/second-page.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'pageTwo/user/:userId/name/:name'
+})
+@Component({
+  templateUrl: 'second-page.html'
+})
+export class SecondPage {
+
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.userId = this.params.data.userId;
+    this.name = this.params.data.name;
+  }
+
+  goToNextPage() {
+    this.nav.push('ThirdPage', { paramOne: 'mono', paramTwo: 'stereo'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nav/pages/left/third-page/third-page.html b/src/components/nav/test/advanced-nav/pages/left/third-page/third-page.html
new file mode 100644
index 00000000000..af317e8de81
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/left/third-page/third-page.html
@@ -0,0 +1,14 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Three</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page Three
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+    Param Two: {{paramTwo}}
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/advanced-nav/pages/left/third-page/third-page.module.ts b/src/components/nav/test/advanced-nav/pages/left/third-page/third-page.module.ts
new file mode 100644
index 00000000000..fab76aa598a
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/left/third-page/third-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { ThirdPage } from './third-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(ThirdPage)
+  ],
+  declarations: [
+    ThirdPage
+  ]
+})
+export class ThirdPageModule { }
diff --git a/src/components/nav/test/advanced-nav/pages/left/third-page/third-page.ts b/src/components/nav/test/advanced-nav/pages/left/third-page/third-page.ts
new file mode 100644
index 00000000000..9cbbc0413f8
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/left/third-page/third-page.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams} from '../../../../../../..';
+
+@IonicPage({
+  segment: 'thirdPage/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  templateUrl: 'third-page.html'
+})
+export class ThirdPage {
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.paramOne = params.data.paramOne;
+    this.paramTwo = params.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/advanced-nav/pages/right/fifth-page/fifth-page.html b/src/components/nav/test/advanced-nav/pages/right/fifth-page/fifth-page.html
new file mode 100644
index 00000000000..3a700e617f8
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/right/fifth-page/fifth-page.html
@@ -0,0 +1,15 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Five</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Page Five</h2>
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name {{name}}
+  </div>
+  <button ion-button (click)="goToNextPage()">Go to Next</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/advanced-nav/pages/right/fifth-page/fifth-page.module.ts b/src/components/nav/test/advanced-nav/pages/right/fifth-page/fifth-page.module.ts
new file mode 100644
index 00000000000..1499d707cf1
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/right/fifth-page/fifth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FifthPage } from './fifth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FifthPage)
+  ],
+  declarations: [
+    FifthPage
+  ]
+})
+export class FifthPageModule { }
diff --git a/src/components/nav/test/advanced-nav/pages/right/fifth-page/fifth-page.ts b/src/components/nav/test/advanced-nav/pages/right/fifth-page/fifth-page.ts
new file mode 100644
index 00000000000..fd3023b1f50
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/right/fifth-page/fifth-page.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'pageFive/user/:userId/name/:name'
+})
+@Component({
+  templateUrl: 'fifth-page.html'
+})
+export class FifthPage {
+
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.userId = this.params.data.userId;
+    this.name = this.params.data.name;
+  }
+
+  goToNextPage() {
+    this.nav.push('SixthPage', { paramOne: 'Tobey', paramTwo: 'Holly'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nav/pages/right/fouth-page/fourth-page.html b/src/components/nav/test/advanced-nav/pages/right/fouth-page/fourth-page.html
new file mode 100644
index 00000000000..a89fef0a4e3
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/right/fouth-page/fourth-page.html
@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Four</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Page Four</h2>
+  <button ion-button (click)="goToPageTwo()">Next</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/advanced-nav/pages/right/fouth-page/fourth-page.module.ts b/src/components/nav/test/advanced-nav/pages/right/fouth-page/fourth-page.module.ts
new file mode 100644
index 00000000000..d041e3bcc8b
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/right/fouth-page/fourth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FourthPage } from './fourth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FourthPage)
+  ],
+  declarations: [
+    FourthPage
+  ]
+})
+export class FourthPageModule { }
diff --git a/src/components/nav/test/advanced-nav/pages/right/fouth-page/fourth-page.ts b/src/components/nav/test/advanced-nav/pages/right/fouth-page/fourth-page.ts
new file mode 100644
index 00000000000..6ad06442e05
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/right/fouth-page/fourth-page.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'fourth-page.html'
+})
+export class FourthPage {
+  constructor(public nav: NavController) {
+  }
+
+  goToPageTwo() {
+    this.nav.push('FifthPage', { userId: '567', name: 'Pamela Beasley'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nav/pages/right/sixth-page/sixth-page.html b/src/components/nav/test/advanced-nav/pages/right/sixth-page/sixth-page.html
new file mode 100644
index 00000000000..8732947e36a
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/right/sixth-page/sixth-page.html
@@ -0,0 +1,14 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Six</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page Six
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+    Param Two: {{paramTwo}}
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/advanced-nav/pages/right/sixth-page/sixth-page.module.ts b/src/components/nav/test/advanced-nav/pages/right/sixth-page/sixth-page.module.ts
new file mode 100644
index 00000000000..212bd5c889e
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/right/sixth-page/sixth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { SixthPage } from './sixth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SixthPage)
+  ],
+  declarations: [
+    SixthPage
+  ]
+})
+export class SixthPageModule { }
diff --git a/src/components/nav/test/advanced-nav/pages/right/sixth-page/sixth-page.ts b/src/components/nav/test/advanced-nav/pages/right/sixth-page/sixth-page.ts
new file mode 100644
index 00000000000..6f075c5fa4b
--- /dev/null
+++ b/src/components/nav/test/advanced-nav/pages/right/sixth-page/sixth-page.ts
@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams} from '../../../../../../..';
+
+@IonicPage({
+  segment: 'sixthPage/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  templateUrl: 'sixth-page.html'
+})
+export class SixthPage {
+
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.paramOne = params.data.paramOne;
+    this.paramTwo = params.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/advanced-nested-navs/app/app.component.ts b/src/components/nav/test/advanced-nested-navs/app/app.component.ts
new file mode 100644
index 00000000000..9ae964b0e66
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/app/app.component.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+
+@Component({
+  template: `
+<ion-split-pane>
+  <ion-nav [root]="rootOne"></ion-nav>
+  <ion-nav [root]="rootTwo" main #content></ion-nav>
+
+</ion-split-pane>
+  `
+})
+export class AppComponent {
+  rootOne = 'NestedNavOnePageOne';
+  rootTwo = 'NestedNavTwoPageOne';
+}
diff --git a/src/components/nav/test/advanced-nested-navs/app/app.module.ts b/src/components/nav/test/advanced-nested-navs/app/app.module.ts
new file mode 100644
index 00000000000..55310fa2157
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/app/app.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent, { swipeBackEnabled: true, preloadModules: true }),
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
diff --git a/src/components/nav/test/advanced-nested-navs/app/main.ts b/src/components/nav/test/advanced-nested-navs/app/main.ts
new file mode 100644
index 00000000000..6af7a5b2ae8
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/app/main.ts
@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/first-page/first-page.html b/src/components/nav/test/advanced-nested-navs/pages/left/first-page/first-page.html
new file mode 100644
index 00000000000..e82b2f23889
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/first-page/first-page.html
@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page One</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Page One</h2>
+  <button ion-button (click)="goToPageTwo()">Go to Page Two</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/first-page/first-page.module.ts b/src/components/nav/test/advanced-nested-navs/pages/left/first-page/first-page.module.ts
new file mode 100644
index 00000000000..c17e0dde59e
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/first-page/first-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FirstPage } from './first-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FirstPage)
+  ],
+  declarations: [
+    FirstPage
+  ]
+})
+export class FirstPageModule { }
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/first-page/first-page.ts b/src/components/nav/test/advanced-nested-navs/pages/left/first-page/first-page.ts
new file mode 100644
index 00000000000..027607bc6d0
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/first-page/first-page.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'first-page.html'
+})
+export class FirstPage {
+  constructor(public nav: NavController) {
+  }
+
+  goToPageTwo() {
+    this.nav.push('SecondPage', { userId: '123', name: 'Michael Scott'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/nested-nav-one/nested-nav-one-page-one.module.ts b/src/components/nav/test/advanced-nested-navs/pages/left/nested-nav-one/nested-nav-one-page-one.module.ts
new file mode 100644
index 00000000000..2da62fb42aa
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/nested-nav-one/nested-nav-one-page-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { NestedNavOnePageOne } from './nested-nav-one-page-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(NestedNavOnePageOne)
+  ],
+  declarations: [
+    NestedNavOnePageOne
+  ]
+})
+export class NestedNavOnePageOneModule { }
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/nested-nav-one/nested-nav-one-page-one.ts b/src/components/nav/test/advanced-nested-navs/pages/left/nested-nav-one/nested-nav-one-page-one.ts
new file mode 100644
index 00000000000..e2626f8237a
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/nested-nav-one/nested-nav-one-page-one.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-nav [root]="root"></ion-nav>
+  `
+})
+export class NestedNavOnePageOne {
+
+  root: string = 'NestedNavOnePageTwo';
+  constructor(public nav: NavController) {
+  }
+}
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/nested-nav-one/nested-nav-one-page-two.module.ts b/src/components/nav/test/advanced-nested-navs/pages/left/nested-nav-one/nested-nav-one-page-two.module.ts
new file mode 100644
index 00000000000..94f61701eda
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/nested-nav-one/nested-nav-one-page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { NestedNavOnePageTwo } from './nested-nav-one-page-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(NestedNavOnePageTwo)
+  ],
+  declarations: [
+    NestedNavOnePageTwo
+  ]
+})
+export class NestedNavOnePageTwoModule { }
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/nested-nav-one/nested-nav-one-page-two.ts b/src/components/nav/test/advanced-nested-navs/pages/left/nested-nav-one/nested-nav-one-page-two.ts
new file mode 100644
index 00000000000..e6ef5ef5c3b
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/nested-nav-one/nested-nav-one-page-two.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-nav [root]="root"></ion-nav>
+  `
+})
+export class NestedNavOnePageTwo {
+
+  root: string = 'FirstPage';
+  constructor(public nav: NavController) {
+  }
+}
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/second-page/second-page.html b/src/components/nav/test/advanced-nested-navs/pages/left/second-page/second-page.html
new file mode 100644
index 00000000000..39d1124a079
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/second-page/second-page.html
@@ -0,0 +1,15 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Two</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Page Two</h2>
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name {{name}}
+  </div>
+  <button ion-button (click)="goToNextPage()">Go to Next</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/second-page/second-page.module.ts b/src/components/nav/test/advanced-nested-navs/pages/left/second-page/second-page.module.ts
new file mode 100644
index 00000000000..ce824037f89
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/second-page/second-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { SecondPage } from './second-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SecondPage)
+  ],
+  declarations: [
+    SecondPage
+  ]
+})
+export class SecondPageModule { }
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/second-page/second-page.ts b/src/components/nav/test/advanced-nested-navs/pages/left/second-page/second-page.ts
new file mode 100644
index 00000000000..44abf580fe3
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/second-page/second-page.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'pageTwo/user/:userId/name/:name'
+})
+@Component({
+  templateUrl: 'second-page.html'
+})
+export class SecondPage {
+
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.userId = this.params.data.userId;
+    this.name = this.params.data.name;
+  }
+
+  goToNextPage() {
+    this.nav.push('ThirdPage', { paramOne: 'mono', paramTwo: 'stereo'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/third-page/third-page.html b/src/components/nav/test/advanced-nested-navs/pages/left/third-page/third-page.html
new file mode 100644
index 00000000000..af317e8de81
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/third-page/third-page.html
@@ -0,0 +1,14 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Three</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page Three
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+    Param Two: {{paramTwo}}
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/third-page/third-page.module.ts b/src/components/nav/test/advanced-nested-navs/pages/left/third-page/third-page.module.ts
new file mode 100644
index 00000000000..fab76aa598a
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/third-page/third-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { ThirdPage } from './third-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(ThirdPage)
+  ],
+  declarations: [
+    ThirdPage
+  ]
+})
+export class ThirdPageModule { }
diff --git a/src/components/nav/test/advanced-nested-navs/pages/left/third-page/third-page.ts b/src/components/nav/test/advanced-nested-navs/pages/left/third-page/third-page.ts
new file mode 100644
index 00000000000..9cbbc0413f8
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/left/third-page/third-page.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams} from '../../../../../../..';
+
+@IonicPage({
+  segment: 'thirdPage/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  templateUrl: 'third-page.html'
+})
+export class ThirdPage {
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.paramOne = params.data.paramOne;
+    this.paramTwo = params.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/fifth-page/fifth-page.html b/src/components/nav/test/advanced-nested-navs/pages/right/fifth-page/fifth-page.html
new file mode 100644
index 00000000000..3a700e617f8
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/fifth-page/fifth-page.html
@@ -0,0 +1,15 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Five</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Page Five</h2>
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name {{name}}
+  </div>
+  <button ion-button (click)="goToNextPage()">Go to Next</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/fifth-page/fifth-page.module.ts b/src/components/nav/test/advanced-nested-navs/pages/right/fifth-page/fifth-page.module.ts
new file mode 100644
index 00000000000..1499d707cf1
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/fifth-page/fifth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FifthPage } from './fifth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FifthPage)
+  ],
+  declarations: [
+    FifthPage
+  ]
+})
+export class FifthPageModule { }
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/fifth-page/fifth-page.ts b/src/components/nav/test/advanced-nested-navs/pages/right/fifth-page/fifth-page.ts
new file mode 100644
index 00000000000..fd3023b1f50
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/fifth-page/fifth-page.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'pageFive/user/:userId/name/:name'
+})
+@Component({
+  templateUrl: 'fifth-page.html'
+})
+export class FifthPage {
+
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.userId = this.params.data.userId;
+    this.name = this.params.data.name;
+  }
+
+  goToNextPage() {
+    this.nav.push('SixthPage', { paramOne: 'Tobey', paramTwo: 'Holly'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/fouth-page/fourth-page.html b/src/components/nav/test/advanced-nested-navs/pages/right/fouth-page/fourth-page.html
new file mode 100644
index 00000000000..a89fef0a4e3
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/fouth-page/fourth-page.html
@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Four</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Page Four</h2>
+  <button ion-button (click)="goToPageTwo()">Next</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/fouth-page/fourth-page.module.ts b/src/components/nav/test/advanced-nested-navs/pages/right/fouth-page/fourth-page.module.ts
new file mode 100644
index 00000000000..d041e3bcc8b
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/fouth-page/fourth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FourthPage } from './fourth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FourthPage)
+  ],
+  declarations: [
+    FourthPage
+  ]
+})
+export class FourthPageModule { }
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/fouth-page/fourth-page.ts b/src/components/nav/test/advanced-nested-navs/pages/right/fouth-page/fourth-page.ts
new file mode 100644
index 00000000000..6ad06442e05
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/fouth-page/fourth-page.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'fourth-page.html'
+})
+export class FourthPage {
+  constructor(public nav: NavController) {
+  }
+
+  goToPageTwo() {
+    this.nav.push('FifthPage', { userId: '567', name: 'Pamela Beasley'});
+  }
+}
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/nested-nav-two/nested-nav-two-page-one.module.ts b/src/components/nav/test/advanced-nested-navs/pages/right/nested-nav-two/nested-nav-two-page-one.module.ts
new file mode 100644
index 00000000000..1fe930c8f65
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/nested-nav-two/nested-nav-two-page-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { NestedNavTwoPageOne } from './nested-nav-two-page-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(NestedNavTwoPageOne)
+  ],
+  declarations: [
+    NestedNavTwoPageOne
+  ]
+})
+export class NestedNavTwoPageOneModule { }
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/nested-nav-two/nested-nav-two-page-one.ts b/src/components/nav/test/advanced-nested-navs/pages/right/nested-nav-two/nested-nav-two-page-one.ts
new file mode 100644
index 00000000000..881a5b9b80f
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/nested-nav-two/nested-nav-two-page-one.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-nav [root]="root"></ion-nav>
+  `
+})
+export class NestedNavTwoPageOne {
+
+  root: string = 'NestedNavTwoPageTwo';
+  constructor(public nav: NavController) {
+  }
+}
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/nested-nav-two/nested-nav-two-page-two.module.ts b/src/components/nav/test/advanced-nested-navs/pages/right/nested-nav-two/nested-nav-two-page-two.module.ts
new file mode 100644
index 00000000000..0ce9ba085b1
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/nested-nav-two/nested-nav-two-page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { NestedNavTwoPageTwo } from './nested-nav-two-page-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(NestedNavTwoPageTwo)
+  ],
+  declarations: [
+    NestedNavTwoPageTwo
+  ]
+})
+export class NestedNavTwoPageTwoModule { }
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/nested-nav-two/nested-nav-two-page-two.ts b/src/components/nav/test/advanced-nested-navs/pages/right/nested-nav-two/nested-nav-two-page-two.ts
new file mode 100644
index 00000000000..6f267decef8
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/nested-nav-two/nested-nav-two-page-two.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-nav [root]="root"></ion-nav>
+  `
+})
+export class NestedNavTwoPageTwo {
+
+  root: string = 'FourthPage';
+  constructor(public nav: NavController) {
+  }
+}
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/sixth-page/sixth-page.html b/src/components/nav/test/advanced-nested-navs/pages/right/sixth-page/sixth-page.html
new file mode 100644
index 00000000000..8732947e36a
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/sixth-page/sixth-page.html
@@ -0,0 +1,14 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Six</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page Six
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+    Param Two: {{paramTwo}}
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/sixth-page/sixth-page.module.ts b/src/components/nav/test/advanced-nested-navs/pages/right/sixth-page/sixth-page.module.ts
new file mode 100644
index 00000000000..212bd5c889e
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/sixth-page/sixth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { SixthPage } from './sixth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SixthPage)
+  ],
+  declarations: [
+    SixthPage
+  ]
+})
+export class SixthPageModule { }
diff --git a/src/components/nav/test/advanced-nested-navs/pages/right/sixth-page/sixth-page.ts b/src/components/nav/test/advanced-nested-navs/pages/right/sixth-page/sixth-page.ts
new file mode 100644
index 00000000000..6f075c5fa4b
--- /dev/null
+++ b/src/components/nav/test/advanced-nested-navs/pages/right/sixth-page/sixth-page.ts
@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams} from '../../../../../../..';
+
+@IonicPage({
+  segment: 'sixthPage/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  templateUrl: 'sixth-page.html'
+})
+export class SixthPage {
+
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.paramOne = params.data.paramOne;
+    this.paramTwo = params.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/advanced-tabs/app/app.component.ts b/src/components/nav/test/advanced-tabs/app/app.component.ts
new file mode 100644
index 00000000000..3de2ca46ed3
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/app/app.component.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+
+@Component({
+  template: `
+<ion-split-pane>
+  <ion-tabs>
+    <ion-tab tabIcon="heart" [root]="tabs1Tab1" tabTitle="Heart"></ion-tab>
+    <ion-tab tabIcon="star" [root]="tabs1Tab2" tabTitle="Star"></ion-tab>
+  </ion-tabs>
+  <ion-tabs>
+    <ion-tab tabIcon="aperture" [root]="tabs2Tab1" tabTitle="Aperture"></ion-tab>
+    <ion-tab tabIcon="apps" [root]="tabs2Tab2" tabTitle="Apps"></ion-tab>
+  </ion-tabs>
+</ion-split-pane>
+  `
+})
+export class AppComponent {
+  tabs1Tab1 = 'TabsOneTabOnePageOne';
+  tabs1Tab2 = 'TabsOneTabTwoPageOne';
+  tabs2Tab1 = 'TabsTwoTabOnePageOne';
+  tabs2Tab2 = 'TabsTwoTabTwoPageOne';
+}
diff --git a/src/components/nav/test/advanced-tabs/app/app.module.ts b/src/components/nav/test/advanced-tabs/app/app.module.ts
new file mode 100644
index 00000000000..55310fa2157
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/app/app.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent, { swipeBackEnabled: true, preloadModules: true }),
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
diff --git a/src/components/nav/test/advanced-tabs/app/main.ts b/src/components/nav/test/advanced-tabs/app/main.ts
new file mode 100644
index 00000000000..6af7a5b2ae8
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/app/main.ts
@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-one/tab-one-page-one.module.ts b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-one/tab-one-page-one.module.ts
new file mode 100644
index 00000000000..4559ff52d8a
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-one/tab-one-page-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOneTabOnePageOne } from './tab-one-page-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOneTabOnePageOne)
+  ],
+  declarations: [
+    TabsOneTabOnePageOne
+  ]
+})
+export class TabsOneTabOnePageOneModule { }
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-one/tab-one-page-one.ts b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-one/tab-one-page-one.ts
new file mode 100644
index 00000000000..be96dffa3e0
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-one/tab-one-page-one.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOneTabOnePageOne'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 1 Tab 1 Page 1</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 1 Tab 1 Page 1
+  <button ion-button (click)="nextPage()">Go to Next Page</button>
+</ion-content>
+  `
+})
+export class TabsOneTabOnePageOne {
+  constructor(public nav: NavController) {
+  }
+
+  nextPage() {
+    this.nav.push('TabsOneTabOnePageTwo', { userId: '123', name: 'Andy Bernard'});
+  }
+}
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-three/tab-one-page-three.module.ts b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-three/tab-one-page-three.module.ts
new file mode 100644
index 00000000000..72b667bef42
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-three/tab-one-page-three.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOneTabOnePageThree } from './tab-one-page-three';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOneTabOnePageThree)
+  ],
+  declarations: [
+    TabsOneTabOnePageThree
+  ]
+})
+export class TabsOneTabOnePageThreeModule { }
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-three/tab-one-page-three.ts b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-three/tab-one-page-three.ts
new file mode 100644
index 00000000000..5deb7fc0689
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-three/tab-one-page-three.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOneTabOnePageThree/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 1 Tab 1 Page 3</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 1 Tab 1 Page 3
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+  Name: {{paramTwo}}
+  </div>
+</ion-content>
+  `
+})
+export class TabsOneTabOnePageThree {
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.paramOne = navParams.data.paramOne;
+    this.paramTwo = navParams.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-two/tab-one-page-two.module.ts b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-two/tab-one-page-two.module.ts
new file mode 100644
index 00000000000..814d2c99e19
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-two/tab-one-page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOneTabOnePageTwo } from './tab-one-page-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOneTabOnePageTwo)
+  ],
+  declarations: [
+    TabsOneTabOnePageTwo
+  ]
+})
+export class TabsOneTabOnePageTwoModule { }
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-two/tab-one-page-two.ts b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-two/tab-one-page-two.ts
new file mode 100644
index 00000000000..8839b6dfda8
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-one-page-two/tab-one-page-two.ts
@@ -0,0 +1,37 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOneTabOnePageTwo/userId/:userId/name/:name'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 1 Tab 1 Page 2</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 1 Tab 1 Page 2
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name: {{name}}
+  </div>
+  <button ion-button (click)="goToNext()">Next</button>
+</ion-content>
+  `
+})
+export class TabsOneTabOnePageTwo {
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.userId = navParams.data.userId;
+    this.name = navParams.data.name;
+  }
+
+  goToNext() {
+    this.nav.push('TabsOneTabOnePageThree', { paramOne: 'Scranton', paramTwo: 'PA'});
+  }
+}
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-one/tab-two-page-one.module.ts b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-one/tab-two-page-one.module.ts
new file mode 100644
index 00000000000..56352b8d939
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-one/tab-two-page-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOneTabTwoPageOne } from './tab-two-page-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOneTabTwoPageOne)
+  ],
+  declarations: [
+    TabsOneTabTwoPageOne
+  ]
+})
+export class TabsOneTabTwoPageOneModule { }
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-one/tab-two-page-one.ts b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-one/tab-two-page-one.ts
new file mode 100644
index 00000000000..70ebb507b89
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-one/tab-two-page-one.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOneTabTwoPageOne'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 1 Tab 2 Page 1</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 1 Tab 2 Page 1
+  <button ion-button (click)="nextPage()">Go to Next Page</button>
+</ion-content>
+  `
+})
+export class TabsOneTabTwoPageOne {
+  constructor(public nav: NavController) {
+  }
+
+  nextPage() {
+    this.nav.push('TabsOneTabTwoPageTwo', { userId: '456', name: 'Stanley Hudson'});
+  }
+}
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-three/tab-two-page-three.module.ts b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-three/tab-two-page-three.module.ts
new file mode 100644
index 00000000000..356be3a980f
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-three/tab-two-page-three.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOneTabTwoPageThree } from './tab-two-page-three';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOneTabTwoPageThree)
+  ],
+  declarations: [
+    TabsOneTabTwoPageThree
+  ]
+})
+export class TabsOneTabTwoPageThreeModule { }
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-three/tab-two-page-three.ts b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-three/tab-two-page-three.ts
new file mode 100644
index 00000000000..74c07a8f70a
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-three/tab-two-page-three.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOneTabTwoPageThree/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 1 Tab 2 Page 3</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 1 Tab 2 Page 3
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+  Param Two: {{paramTwo}}
+  </div>
+</ion-content>
+  `
+})
+export class TabsOneTabTwoPageThree {
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.paramOne = navParams.data.paramOne;
+    this.paramTwo = navParams.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-two/tab-two-page-two.module.ts b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-two/tab-two-page-two.module.ts
new file mode 100644
index 00000000000..493f9e41b5a
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-two/tab-two-page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsOneTabTwoPageTwo } from './tab-two-page-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsOneTabTwoPageTwo)
+  ],
+  declarations: [
+    TabsOneTabTwoPageTwo
+  ]
+})
+export class TabsOneTabTwoPageTwoModule { }
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-two/tab-two-page-two.ts b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-two/tab-two-page-two.ts
new file mode 100644
index 00000000000..8f213c8518c
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-one/tab-two-page-two/tab-two-page-two.ts
@@ -0,0 +1,37 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsOneTabTwoPageTwo/userId/:userId/name/:name'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 1 Tab 2 Page 2</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 1 Tab 2 Page 2
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name: {{name}}
+  </div>
+  <button ion-button (click)="goToNext()">Next</button>
+</ion-content>
+  `
+})
+export class TabsOneTabTwoPageTwo {
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.userId = navParams.data.userId;
+    this.name = navParams.data.name;
+  }
+
+  goToNext() {
+    this.nav.push('TabsOneTabTwoPageThree', { paramOne: 'Nashua', paramTwo: 'NH'});
+  }
+}
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-one/tab-one-page-one.module.ts b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-one/tab-one-page-one.module.ts
new file mode 100644
index 00000000000..e6cef890720
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-one/tab-one-page-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoTabOnePageOne } from './tab-one-page-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoTabOnePageOne)
+  ],
+  declarations: [
+    TabsTwoTabOnePageOne
+  ]
+})
+export class TabsTwoTabOnePageOneModule { }
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-one/tab-one-page-one.ts b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-one/tab-one-page-one.ts
new file mode 100644
index 00000000000..6a0608474b2
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-one/tab-one-page-one.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoTabOnePageOne'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 2 Tab 1 Page 1</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 2 Tab 1 Page 1
+  <button ion-button (click)="nextPage()">Go to Next Page</button>
+</ion-content>
+  `
+})
+export class TabsTwoTabOnePageOne {
+  constructor(public nav: NavController) {
+  }
+
+  nextPage() {
+    this.nav.push('TabsTwoTabOnePageTwo', { userId: '234', name: 'Phillis Vance - Vance Refridgeration'});
+  }
+}
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-three/tab-one-page-three.module.ts b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-three/tab-one-page-three.module.ts
new file mode 100644
index 00000000000..51e8d257f6d
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-three/tab-one-page-three.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoTabOnePageThree } from './tab-one-page-three';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoTabOnePageThree)
+  ],
+  declarations: [
+    TabsTwoTabOnePageThree
+  ]
+})
+export class TabsTwoTabOnePageThreeModule { }
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-three/tab-one-page-three.ts b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-three/tab-one-page-three.ts
new file mode 100644
index 00000000000..b84f6b9feff
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-three/tab-one-page-three.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoTabOnePageThree/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 2 Tab 1 Page 3</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 2 Tab 1 Page 3
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+  Param Two: {{paramTwo}}
+  </div>
+</ion-content>
+  `
+})
+export class TabsTwoTabOnePageThree {
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.paramOne = navParams.data.paramOne;
+    this.paramTwo = navParams.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-two/tab-one-page-two.module.ts b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-two/tab-one-page-two.module.ts
new file mode 100644
index 00000000000..d9518047a08
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-two/tab-one-page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoTabOnePageTwo } from './tab-one-page-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoTabOnePageTwo)
+  ],
+  declarations: [
+    TabsTwoTabOnePageTwo
+  ]
+})
+export class TabsTwoTabOnePageTwoModule { }
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-two/tab-one-page-two.ts b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-two/tab-one-page-two.ts
new file mode 100644
index 00000000000..fbaf3cd90a0
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-one-page-two/tab-one-page-two.ts
@@ -0,0 +1,37 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoTabOnePageTwo/userId/:userId/name/:name'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 2 Tab 1 Page 2</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 2 Tab 1 Page 2
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name: {{name}}
+  </div>
+  <button ion-button (click)="goToNext()">Next</button>
+</ion-content>
+  `
+})
+export class TabsTwoTabOnePageTwo {
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.userId = navParams.data.userId;
+    this.name = navParams.data.name;
+  }
+
+  goToNext() {
+    this.nav.push('TabsTwoTabOnePageThree', { paramOne: 'Stamford', paramTwo: 'CT'});
+  }
+}
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-one/tab-two-page-one.module.ts b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-one/tab-two-page-one.module.ts
new file mode 100644
index 00000000000..0e21ef3d25a
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-one/tab-two-page-one.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoTabTwoPageOne } from './tab-two-page-one';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoTabTwoPageOne)
+  ],
+  declarations: [
+    TabsTwoTabTwoPageOne
+  ]
+})
+export class TabsTwoTabTwoPageOneModule { }
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-one/tab-two-page-one.ts b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-one/tab-two-page-one.ts
new file mode 100644
index 00000000000..cc13a9e116d
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-one/tab-two-page-one.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoTabTwoPageOne'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 2 Tab 2 Page 1</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 2 Tab 2 Page 1
+  <button ion-button (click)="nextPage()">Go to Next Page</button>
+</ion-content>
+  `
+})
+export class TabsTwoTabTwoPageOne {
+  constructor(public nav: NavController) {
+  }
+
+  nextPage() {
+    this.nav.push('TabsTwoTabTwoPageTwo', { userId: '456', name: 'Michael Scarn'});
+  }
+}
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-three/tab-two-page-three.module.ts b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-three/tab-two-page-three.module.ts
new file mode 100644
index 00000000000..0f4524411a8
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-three/tab-two-page-three.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoTabTwoPageThree } from './tab-two-page-three';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoTabTwoPageThree)
+  ],
+  declarations: [
+    TabsTwoTabTwoPageThree
+  ]
+})
+export class TabsTwoTabTwoPageThreeModule { }
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-three/tab-two-page-three.ts b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-three/tab-two-page-three.ts
new file mode 100644
index 00000000000..41ab0873ec1
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-three/tab-two-page-three.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoTabTwoPageThree/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 2 Tab 2 Page 3</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 2 Tab 2 Page 3
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+  Param Two: {{paramTwo}}
+  </div>
+</ion-content>
+  `
+})
+export class TabsTwoTabTwoPageThree {
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.paramOne = navParams.data.paramOne;
+    this.paramTwo = navParams.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-two/tab-two-page-two.module.ts b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-two/tab-two-page-two.module.ts
new file mode 100644
index 00000000000..bdbddc50cde
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-two/tab-two-page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { TabsTwoTabTwoPageTwo } from './tab-two-page-two';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsTwoTabTwoPageTwo)
+  ],
+  declarations: [
+    TabsTwoTabTwoPageTwo
+  ]
+})
+export class TabsTwoTabTwoPageTwoModule { }
diff --git a/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-two/tab-two-page-two.ts b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-two/tab-two-page-two.ts
new file mode 100644
index 00000000000..7d7c10dd1b2
--- /dev/null
+++ b/src/components/nav/test/advanced-tabs/pages/tabs-two/tab-two-page-two/tab-two-page-two.ts
@@ -0,0 +1,37 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'TabsTwoTabTwoPageTwo/userId/:userId/name/:name'
+})
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Tabs 2 Tab 2 Page 2</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Tabs 2 Tab 2 Page 2
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name: {{name}}
+  </div>
+  <button ion-button (click)="next()">Next</button>
+</ion-content>
+  `
+})
+export class TabsTwoTabTwoPageTwo {
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, navParams: NavParams) {
+    this.userId = navParams.data.userId;
+    this.name = navParams.data.name;
+  }
+
+  next() {
+    this.nav.push('TabsTwoTabTwoPageThree', { paramOne: 'Albany', paramTwo: 'NY'});
+  }
+}
diff --git a/src/components/nav/test/basic/pages/first-page/first-page.ts b/src/components/nav/test/basic/pages/first-page/first-page.ts
index f2df09ae663..0c42ced72b9 100644
--- a/src/components/nav/test/basic/pages/first-page/first-page.ts
+++ b/src/components/nav/test/basic/pages/first-page/first-page.ts
@@ -118,11 +118,11 @@ export class FirstPage {
     this.navCtrl.push('primary-header-page', null, {
       animate: true,
       animation: 'ios-transition'
-    }).then(() => { }, (rejectReason: string) => { });
+    }).then(() => { }, () => { });
   }
 
   pushRedirect() {
-    this.navCtrl.push('redirect-page').then(() => { }, (rejectReason: string) => { });
+    this.navCtrl.push('redirect-page').then(() => { }, () => { });
   }
 
   pushFullPage() {
diff --git a/src/components/nav/test/basic/pages/full-page/full-page.ts b/src/components/nav/test/basic/pages/full-page/full-page.ts
index 18c5cd15e63..6cbe3417961 100644
--- a/src/components/nav/test/basic/pages/full-page/full-page.ts
+++ b/src/components/nav/test/basic/pages/full-page/full-page.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { App, AlertController, IonicPage, NavController, NavParams, ViewController } from '../../../../../..';
+import { AlertController, App, IonicPage, NavController, NavParams, ViewController } from '../../../../../..';
 
 @IonicPage({
   name: 'full-page'
diff --git a/src/components/nav/test/nav-push-pop/app.module.ts b/src/components/nav/test/nav-push-pop/app.module.ts
deleted file mode 100644
index 39408ac06b1..00000000000
--- a/src/components/nav/test/nav-push-pop/app.module.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, NavParams } from '../../../..';
-
-
-
-@Component({
-  template: `
-<ion-header>
-  <ion-navbar>
-    <ion-title>Second Page</ion-title>
-  </ion-navbar>
-</ion-header>
-
-<ion-content padding>{{msg}}</ion-content>
-`
-})
-export class SecondPage {
-  msg: string = '';
-  constructor(params: NavParams) {
-    this.msg = params.get('msg');
-  }
-}
-
-
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class E2EPage {
-  pushPage: any = SecondPage;
-  visible: boolean = false;
-  buttons: number[] = [1, 2, 3, 4, 5];
-
-  ionViewDidEnter() {
-    this.visible = true;
-  }
-}
-
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class AppComponent {
-  root = E2EPage;
-}
-
-@NgModule({
-  declarations: [
-    AppComponent,
-    E2EPage,
-    SecondPage
-  ],
-  imports: [
-    BrowserModule,
-    IonicModule.forRoot(AppComponent)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    E2EPage,
-    SecondPage
-  ]
-})
-export class AppModule {}
-
diff --git a/src/components/nav/test/nav-push-pop/app/app.component.ts b/src/components/nav/test/nav-push-pop/app/app.component.ts
new file mode 100644
index 00000000000..2464709164e
--- /dev/null
+++ b/src/components/nav/test/nav-push-pop/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  template: `
+<ion-nav [root]="root"></ion-nav>
+  `
+})
+export class AppComponent {
+  root = 'FirstPage';
+}
diff --git a/src/components/nav/test/nav-push-pop/app/app.module.ts b/src/components/nav/test/nav-push-pop/app/app.module.ts
new file mode 100644
index 00000000000..55310fa2157
--- /dev/null
+++ b/src/components/nav/test/nav-push-pop/app/app.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent, { swipeBackEnabled: true, preloadModules: true }),
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
diff --git a/src/components/nav/test/nav-push-pop/app/main.ts b/src/components/nav/test/nav-push-pop/app/main.ts
new file mode 100644
index 00000000000..6af7a5b2ae8
--- /dev/null
+++ b/src/components/nav/test/nav-push-pop/app/main.ts
@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/components/nav/test/nav-push-pop/main.html b/src/components/nav/test/nav-push-pop/pages/first-page/first-page.html
similarity index 100%
rename from src/components/nav/test/nav-push-pop/main.html
rename to src/components/nav/test/nav-push-pop/pages/first-page/first-page.html
diff --git a/src/components/nav/test/nav-push-pop/pages/first-page/first-page.module.ts b/src/components/nav/test/nav-push-pop/pages/first-page/first-page.module.ts
new file mode 100644
index 00000000000..c088e9f2d4c
--- /dev/null
+++ b/src/components/nav/test/nav-push-pop/pages/first-page/first-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { FirstPage } from './first-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FirstPage)
+  ],
+  declarations: [
+    FirstPage
+  ]
+})
+export class FirstPageModule { }
diff --git a/src/components/nav/test/nav-push-pop/pages/first-page/first-page.ts b/src/components/nav/test/nav-push-pop/pages/first-page/first-page.ts
new file mode 100644
index 00000000000..49778cedb35
--- /dev/null
+++ b/src/components/nav/test/nav-push-pop/pages/first-page/first-page.ts
@@ -0,0 +1,16 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'first-page.html'
+})
+export class FirstPage {
+  pushPage: any = 'SecondPage';
+  visible: boolean = false;
+  buttons: number[] = [1, 2, 3, 4, 5];
+
+  ionViewDidEnter() {
+    this.visible = true;
+  }
+}
diff --git a/src/components/nav/test/nav-push-pop/pages/second-page/second-page.module.ts b/src/components/nav/test/nav-push-pop/pages/second-page/second-page.module.ts
new file mode 100644
index 00000000000..08053b890ac
--- /dev/null
+++ b/src/components/nav/test/nav-push-pop/pages/second-page/second-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { SecondPage } from './second-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SecondPage)
+  ],
+  declarations: [
+    SecondPage
+  ]
+})
+export class SecondPageModule { }
diff --git a/src/components/nav/test/nav-push-pop/pages/second-page/second-page.ts b/src/components/nav/test/nav-push-pop/pages/second-page/second-page.ts
new file mode 100644
index 00000000000..7dd6c718d7b
--- /dev/null
+++ b/src/components/nav/test/nav-push-pop/pages/second-page/second-page.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavParams } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+<ion-header>
+  <ion-navbar>
+    <ion-title>Second Page</ion-title>
+  </ion-navbar>
+</ion-header>
+
+<ion-content padding>{{msg}}</ion-content>
+`
+})
+export class SecondPage {
+  msg: string = '';
+  constructor(params: NavParams) {
+    this.msg = params.get('msg');
+  }
+}
diff --git a/src/components/nav/test/nav.spec.ts b/src/components/nav/test/nav.spec.ts
index 075213abdb4..76b156e2677 100644
--- a/src/components/nav/test/nav.spec.ts
+++ b/src/components/nav/test/nav.spec.ts
@@ -1,7 +1,6 @@
 import { Nav } from '../nav';
 
 import { GestureController } from '../../../gestures/gesture-controller';
-import { Keyboard } from '../../../platform/keyboard';
 import {
   mockApp,
   mockConfig,
@@ -23,14 +22,14 @@ describe('Nav', () => {
         component: knownComponent
       };
       const knownViews = {};
-      spyOn(nav._linker, 'initNav').and.returnValue(knownSegment);
+      spyOn(nav._linker, 'getSegmentByNavIdOrName').and.returnValue(knownSegment);
       spyOn(nav._linker, 'initViews').and.returnValue(Promise.resolve(knownViews));
       spyOn(nav, 'setPages');
 
       const promise = nav.ngAfterViewInit();
 
       promise.then(() => {
-        expect(nav._linker.initViews).toHaveBeenCalledWith(knownSegment);
+        expect(nav._linker.getSegmentByNavIdOrName).toHaveBeenCalledWith(nav.id, nav.name);
         expect(nav.setPages).toHaveBeenCalledWith(knownViews, null, null);
         done();
       }).catch((err: Error) => {
@@ -46,7 +45,7 @@ describe('Nav', () => {
         loadChildren: knownLoadChildren
       };
       const knownViews = {};
-      spyOn(nav._linker, 'initNav').and.returnValue(knownSegment);
+      spyOn(nav._linker, 'getSegmentByNavIdOrName').and.returnValue(knownSegment);
       spyOn(nav._linker, 'initViews').and.returnValue(Promise.resolve(knownViews));
       spyOn(nav, 'setPages');
 
@@ -88,7 +87,6 @@ function getNav() {
   const app = mockApp(config, platform);
   const zone = mockZone();
   const dom = mockDomController(platform);
-  const keyboard = new Keyboard(config, platform, zone, dom);
   const elementRef = mockElementRef();
   const renderer = mockRenderer();
   const componentFactoryResolver: any = null;
@@ -101,7 +99,6 @@ function getNav() {
     app,
     config,
     platform,
-    keyboard,
     elementRef,
     zone,
     renderer,
diff --git a/src/components/nav/test/simple-nav-then-tabs/app/app.component.ts b/src/components/nav/test/simple-nav-then-tabs/app/app.component.ts
new file mode 100644
index 00000000000..3337574380a
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/app/app.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  template: `<ion-nav [root]="root"></ion-nav>`
+})
+export class AppComponent {
+  root = 'LoginPage';
+}
diff --git a/src/components/nav/test/simple-nav-then-tabs/app/app.module.ts b/src/components/nav/test/simple-nav-then-tabs/app/app.module.ts
new file mode 100644
index 00000000000..55310fa2157
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/app/app.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent, { swipeBackEnabled: true, preloadModules: true }),
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
diff --git a/src/components/nav/test/simple-nav-then-tabs/app/main.ts b/src/components/nav/test/simple-nav-then-tabs/app/main.ts
new file mode 100644
index 00000000000..6af7a5b2ae8
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/app/main.ts
@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/login-page/login-page.module.ts b/src/components/nav/test/simple-nav-then-tabs/pages/login-page/login-page.module.ts
new file mode 100644
index 00000000000..e3cbf3d9160
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/login-page/login-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { LoginPage } from './login-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(LoginPage)
+  ],
+  declarations: [
+    LoginPage
+  ]
+})
+export class LoginPageModule { }
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/login-page/login-page.ts b/src/components/nav/test/simple-nav-then-tabs/pages/login-page/login-page.ts
new file mode 100644
index 00000000000..81f07a055c1
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/login-page/login-page.ts
@@ -0,0 +1,24 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-header>
+      <ion-navbar>
+        <ion-title>Login</ion-title>
+      </ion-navbar>
+    </ion-header>
+    <ion-content>
+      <button ion-button (click)="clickMe()">Login</button>
+    </ion-content>
+  `
+})
+export class LoginPage {
+  constructor(public nav: NavController) {
+  }
+
+  clickMe() {
+    this.nav.push('TabsPage');
+  }
+}
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/first-page/first-page.html b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/first-page/first-page.html
new file mode 100644
index 00000000000..e765b809169
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/first-page/first-page.html
@@ -0,0 +1,11 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>First Page</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  First Page
+  <div>
+    <button ion-button (click)="clickMe()">Go To Next Page</button>
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/first-page/first-page.module.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/first-page/first-page.module.ts
new file mode 100644
index 00000000000..c17e0dde59e
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/first-page/first-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FirstPage } from './first-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FirstPage)
+  ],
+  declarations: [
+    FirstPage
+  ]
+})
+export class FirstPageModule { }
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/first-page/first-page.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/first-page/first-page.ts
new file mode 100644
index 00000000000..79628e92b20
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/first-page/first-page.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'first-page.html'
+})
+export class FirstPage {
+  constructor(public nav: NavController) {
+  }
+
+  clickMe() {
+    this.nav.push('SecondPage', { userId: '123', name: 'Phyllis Vance, Vance Refridgeration'});
+  }
+}
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/second-page/second-page.html b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/second-page/second-page.html
new file mode 100644
index 00000000000..add45e1e846
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/second-page/second-page.html
@@ -0,0 +1,14 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Second Page</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name {{name}}
+  </div>
+  <button ion-button (click)="goToNextPage()">Next Page</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/second-page/second-page.module.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/second-page/second-page.module.ts
new file mode 100644
index 00000000000..ce824037f89
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/second-page/second-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { SecondPage } from './second-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SecondPage)
+  ],
+  declarations: [
+    SecondPage
+  ]
+})
+export class SecondPageModule { }
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/second-page/second-page.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/second-page/second-page.ts
new file mode 100644
index 00000000000..5f69e8be4c1
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/second-page/second-page.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'secondPage/user/:userId/name/:name'
+})
+@Component({
+  templateUrl: 'second-page.html'
+})
+export class SecondPage {
+
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.userId = this.params.data.userId;
+    this.name = this.params.data.name;
+  }
+
+  goToNextPage() {
+    this.nav.push('ThirdPage', { paramOne: 'Tobey', paramTwo: 'Kevin'});
+  }
+}
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/third-page/third-page.html b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/third-page/third-page.html
new file mode 100644
index 00000000000..314a287d2f2
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/third-page/third-page.html
@@ -0,0 +1,14 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Third Page</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Third Page</h2>
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+  Param Two: {{paramTwo}}
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/third-page/third-page.module.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/third-page/third-page.module.ts
new file mode 100644
index 00000000000..fab76aa598a
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/third-page/third-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { ThirdPage } from './third-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(ThirdPage)
+  ],
+  declarations: [
+    ThirdPage
+  ]
+})
+export class ThirdPageModule { }
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/third-page/third-page.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/third-page/third-page.ts
new file mode 100644
index 00000000000..17790fdb200
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-one/third-page/third-page.ts
@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'thirdPage/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  templateUrl: 'third-page.html'
+})
+export class ThirdPage {
+
+  paramOne: string;
+  paramTwo: string;
+
+  constructor(public nav: NavController, public params: NavParams) {
+    this.paramOne = this.params.data.paramOne;
+    this.paramTwo = this.params.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fifth-page/fifth-page.html b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fifth-page/fifth-page.html
new file mode 100644
index 00000000000..5c551e0ba42
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fifth-page/fifth-page.html
@@ -0,0 +1,15 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Fifth Page</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Fifth Page
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name {{name}}
+  </div>
+  <button ion-button (click)="goToNextPage()">Next Page</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fifth-page/fifth-page.module.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fifth-page/fifth-page.module.ts
new file mode 100644
index 00000000000..1499d707cf1
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fifth-page/fifth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FifthPage } from './fifth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FifthPage)
+  ],
+  declarations: [
+    FifthPage
+  ]
+})
+export class FifthPageModule { }
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fifth-page/fifth-page.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fifth-page/fifth-page.ts
new file mode 100644
index 00000000000..5a97db66c2f
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fifth-page/fifth-page.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'fifthPage/user/:userId/name/:name'
+})
+@Component({
+  templateUrl: 'fifth-page.html'
+})
+export class FifthPage {
+
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.userId = this.params.data.userId;
+    this.name = this.params.data.name;
+  }
+
+  goToNextPage() {
+    this.nav.push('SixthPage', { paramOne: 'Kelly Kapore', paramTwo: 'Creed Bratton'});
+  }
+}
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fourth-page/fourth-page.html b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fourth-page/fourth-page.html
new file mode 100644
index 00000000000..52ac013fb70
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fourth-page/fourth-page.html
@@ -0,0 +1,11 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Fourth Page</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Fourth Page
+  <div>
+    <button ion-button (click)="clickMe()">Go To Next Page</button>
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fourth-page/fourth-page.module.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fourth-page/fourth-page.module.ts
new file mode 100644
index 00000000000..d041e3bcc8b
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fourth-page/fourth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FourthPage } from './fourth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FourthPage)
+  ],
+  declarations: [
+    FourthPage
+  ]
+})
+export class FourthPageModule { }
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fourth-page/fourth-page.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fourth-page/fourth-page.ts
new file mode 100644
index 00000000000..2dc366e03f7
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/fourth-page/fourth-page.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'fourth-page.html'
+})
+export class FourthPage {
+  constructor(public nav: NavController) {
+  }
+
+  clickMe() {
+    this.nav.push('FifthPage', { userId: '456', name: 'Ryan Howard'});
+  }
+}
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/sixth-page/sixth-page.html b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/sixth-page/sixth-page.html
new file mode 100644
index 00000000000..01e2773f33b
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/sixth-page/sixth-page.html
@@ -0,0 +1,14 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Sixth Page</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Sixth Page</h2>
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+  Param Two: {{paramTwo}}
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/sixth-page/sixth-page.module.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/sixth-page/sixth-page.module.ts
new file mode 100644
index 00000000000..212bd5c889e
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/sixth-page/sixth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { SixthPage } from './sixth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SixthPage)
+  ],
+  declarations: [
+    SixthPage
+  ]
+})
+export class SixthPageModule { }
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/sixth-page/sixth-page.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/sixth-page/sixth-page.ts
new file mode 100644
index 00000000000..53a529ad6dd
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tab-two/sixth-page/sixth-page.ts
@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'sixthPage/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  templateUrl: 'sixth-page.html'
+})
+export class SixthPage {
+
+  paramOne: string;
+  paramTwo: string;
+
+  constructor(public nav: NavController, public params: NavParams) {
+    this.paramOne = this.params.data.paramOne;
+    this.paramTwo = this.params.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tabs/tabs-page.module.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tabs/tabs-page.module.ts
new file mode 100644
index 00000000000..83778955e4b
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tabs/tabs-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { TabsPage } from './tabs-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(TabsPage)
+  ],
+  declarations: [
+    TabsPage
+  ]
+})
+export class TabsPageModule { }
diff --git a/src/components/nav/test/simple-nav-then-tabs/pages/tabs/tabs-page.ts b/src/components/nav/test/simple-nav-then-tabs/pages/tabs/tabs-page.ts
new file mode 100644
index 00000000000..70cca4a5f9a
--- /dev/null
+++ b/src/components/nav/test/simple-nav-then-tabs/pages/tabs/tabs-page.ts
@@ -0,0 +1,16 @@
+import { Component } from '@angular/core';
+import { IonicPage, } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+  <ion-tabs name="app">
+    <ion-tab tabIcon="heart" [root]="tab1" tabTitle="Taco Burrito Enchilada"></ion-tab>
+    <ion-tab tabIcon="star" [root]="tab2"></ion-tab>
+  </ion-tabs>
+  `
+})
+export class TabsPage {
+  tab1 = 'FirstPage';
+  tab2 = 'FourthPage';
+}
diff --git a/src/components/nav/test/simple-nav/app/app.component.ts b/src/components/nav/test/simple-nav/app/app.component.ts
new file mode 100644
index 00000000000..10cf363ea4c
--- /dev/null
+++ b/src/components/nav/test/simple-nav/app/app.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  template: `<ion-nav [root]="root" name="default"></ion-nav>`
+})
+export class AppComponent {
+  root = 'FirstPage';
+}
diff --git a/src/components/nav/test/simple-nav/app/app.module.ts b/src/components/nav/test/simple-nav/app/app.module.ts
new file mode 100644
index 00000000000..55310fa2157
--- /dev/null
+++ b/src/components/nav/test/simple-nav/app/app.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent, { swipeBackEnabled: true, preloadModules: true }),
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
diff --git a/src/components/nav/test/simple-nav/app/main.ts b/src/components/nav/test/simple-nav/app/main.ts
new file mode 100644
index 00000000000..6af7a5b2ae8
--- /dev/null
+++ b/src/components/nav/test/simple-nav/app/main.ts
@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/components/nav/test/simple-nav/pages/first-page/first-page.html b/src/components/nav/test/simple-nav/pages/first-page/first-page.html
new file mode 100644
index 00000000000..0f6c090ee8b
--- /dev/null
+++ b/src/components/nav/test/simple-nav/pages/first-page/first-page.html
@@ -0,0 +1,10 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>First Page</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page One
+  <button ion-button (click)="goToPageTwo()">Go to Page Two</button>
+  <a href="#/nav/n4/user/123/name/ted">Using href</a>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nav/pages/first-page/first-page.module.ts b/src/components/nav/test/simple-nav/pages/first-page/first-page.module.ts
new file mode 100644
index 00000000000..c088e9f2d4c
--- /dev/null
+++ b/src/components/nav/test/simple-nav/pages/first-page/first-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { FirstPage } from './first-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FirstPage)
+  ],
+  declarations: [
+    FirstPage
+  ]
+})
+export class FirstPageModule { }
diff --git a/src/components/nav/test/simple-nav/pages/first-page/first-page.ts b/src/components/nav/test/simple-nav/pages/first-page/first-page.ts
new file mode 100644
index 00000000000..da3376f1929
--- /dev/null
+++ b/src/components/nav/test/simple-nav/pages/first-page/first-page.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'first-page.html'
+})
+export class FirstPage {
+  constructor(public nav: NavController) {
+  }
+
+  goToPageTwo() {
+    this.nav.push('SecondPage', { userId: '123', name: 'ted'});
+  }
+}
diff --git a/src/components/nav/test/simple-nav/pages/second-page/second-page.html b/src/components/nav/test/simple-nav/pages/second-page/second-page.html
new file mode 100644
index 00000000000..acf24b32710
--- /dev/null
+++ b/src/components/nav/test/simple-nav/pages/second-page/second-page.html
@@ -0,0 +1,16 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Second Page</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name {{name}}
+  </div>
+  <div>
+    <button ion-button (click)="goToNextPage()">Go to Next Page</button>
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nav/pages/second-page/second-page.module.ts b/src/components/nav/test/simple-nav/pages/second-page/second-page.module.ts
new file mode 100644
index 00000000000..08053b890ac
--- /dev/null
+++ b/src/components/nav/test/simple-nav/pages/second-page/second-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { SecondPage } from './second-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SecondPage)
+  ],
+  declarations: [
+    SecondPage
+  ]
+})
+export class SecondPageModule { }
diff --git a/src/components/nav/test/simple-nav/pages/second-page/second-page.ts b/src/components/nav/test/simple-nav/pages/second-page/second-page.ts
new file mode 100644
index 00000000000..c69d39383ea
--- /dev/null
+++ b/src/components/nav/test/simple-nav/pages/second-page/second-page.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../..';
+
+@IonicPage({
+  segment: 'user/:userId/name/:name'
+})
+@Component({
+  templateUrl: 'second-page.html'
+})
+export class SecondPage {
+
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.userId = this.params.data.userId;
+    this.name = this.params.data.name;
+  }
+
+  goToNextPage() {
+    this.nav.push('ThirdPage', { paramOne: 'Hello', paramTwo: 'Its me'});
+  }
+}
diff --git a/src/components/nav/test/simple-nav/pages/third-page/third-page.html b/src/components/nav/test/simple-nav/pages/third-page/third-page.html
new file mode 100644
index 00000000000..1a7d5eccc25
--- /dev/null
+++ b/src/components/nav/test/simple-nav/pages/third-page/third-page.html
@@ -0,0 +1,13 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Third Page</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+  Param Two: {{paramTwo}}
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nav/pages/third-page/third-page.module.ts b/src/components/nav/test/simple-nav/pages/third-page/third-page.module.ts
new file mode 100644
index 00000000000..3ae80405cc0
--- /dev/null
+++ b/src/components/nav/test/simple-nav/pages/third-page/third-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { ThirdPage } from './third-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(ThirdPage)
+  ],
+  declarations: [
+    ThirdPage
+  ]
+})
+export class ThirdPageModule { }
diff --git a/src/components/nav/test/simple-nav/pages/third-page/third-page.ts b/src/components/nav/test/simple-nav/pages/third-page/third-page.ts
new file mode 100644
index 00000000000..4865e297ceb
--- /dev/null
+++ b/src/components/nav/test/simple-nav/pages/third-page/third-page.ts
@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../..';
+
+@IonicPage({
+  segment: 'paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  templateUrl: 'third-page.html'
+})
+export class ThirdPage {
+
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.paramOne = this.params.data.paramOne;
+    this.paramTwo = this.params.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/simple-nested-navs/app/app.component.ts b/src/components/nav/test/simple-nested-navs/app/app.component.ts
new file mode 100644
index 00000000000..c824419ea25
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/app/app.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  template: `<ion-nav [root]="root"></ion-nav>`
+})
+export class AppComponent {
+  root = 'SecondNav';
+}
diff --git a/src/components/nav/test/simple-nested-navs/app/app.module.ts b/src/components/nav/test/simple-nested-navs/app/app.module.ts
new file mode 100644
index 00000000000..55310fa2157
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/app/app.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent, { swipeBackEnabled: true, preloadModules: true }),
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
diff --git a/src/components/nav/test/simple-nested-navs/app/main.ts b/src/components/nav/test/simple-nested-navs/app/main.ts
new file mode 100644
index 00000000000..6af7a5b2ae8
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/app/main.ts
@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/components/nav/test/simple-nested-navs/pages/first-page/first-page.module.ts b/src/components/nav/test/simple-nested-navs/pages/first-page/first-page.module.ts
new file mode 100644
index 00000000000..c088e9f2d4c
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/pages/first-page/first-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { FirstPage } from './first-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FirstPage)
+  ],
+  declarations: [
+    FirstPage
+  ]
+})
+export class FirstPageModule { }
diff --git a/src/components/nav/test/simple-nested-navs/pages/first-page/first-page.ts b/src/components/nav/test/simple-nested-navs/pages/first-page/first-page.ts
new file mode 100644
index 00000000000..bcad7632861
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/pages/first-page/first-page.ts
@@ -0,0 +1,28 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  selector: 'page-home',
+  template: `
+  <ion-header>
+    <ion-navbar>
+      <ion-title>First Page</ion-title>
+    </ion-navbar>
+  </ion-header>
+  <ion-content>
+    First Page
+    <button ion-button (click)="goToNextPage()">Go to Next Page</button>
+  </ion-content>
+  `
+})
+export class FirstPage {
+
+  constructor(public navCtrl: NavController) {
+
+  }
+
+  goToNextPage() {
+    this.navCtrl.push('SecondPage', { userId: 123, name: 'Dwight K Schrute'});
+  }
+}
diff --git a/src/components/nav/test/simple-nested-navs/pages/second-nav/second-nav.module.ts b/src/components/nav/test/simple-nested-navs/pages/second-nav/second-nav.module.ts
new file mode 100644
index 00000000000..b4a43298e89
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/pages/second-nav/second-nav.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { SecondNav } from './second-nav';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SecondNav)
+  ],
+  declarations: [
+    SecondNav
+  ]
+})
+export class SecondNavModule { }
diff --git a/src/components/nav/test/simple-nested-navs/pages/second-nav/second-nav.ts b/src/components/nav/test/simple-nested-navs/pages/second-nav/second-nav.ts
new file mode 100644
index 00000000000..dc7b58340a7
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/pages/second-nav/second-nav.ts
@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  selector: 'page-home',
+  template: `
+  <ion-nav [root]="rootPage"></ion-nav>
+
+  `
+})
+export class SecondNav {
+
+  rootPage: any = 'ThirdNav';
+  constructor(public navCtrl: NavController) {
+
+  }
+
+}
diff --git a/src/components/nav/test/simple-nested-navs/pages/second-page/second-page.module.ts b/src/components/nav/test/simple-nested-navs/pages/second-page/second-page.module.ts
new file mode 100644
index 00000000000..08053b890ac
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/pages/second-page/second-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { SecondPage } from './second-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SecondPage)
+  ],
+  declarations: [
+    SecondPage
+  ]
+})
+export class SecondPageModule { }
diff --git a/src/components/nav/test/simple-nested-navs/pages/second-page/second-page.ts b/src/components/nav/test/simple-nested-navs/pages/second-page/second-page.ts
new file mode 100644
index 00000000000..7c8300c1112
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/pages/second-page/second-page.ts
@@ -0,0 +1,39 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../..';
+
+@IonicPage({
+  segment: 'secondPage/userId/:userId/name/:name'
+})
+@Component({
+  selector: 'page-home',
+  template: `
+  <ion-header>
+    <ion-navbar>
+      <ion-title>Second Page</ion-title>
+    </ion-navbar>
+  </ion-header>
+  <ion-content>
+    Second Page
+    User ID: {{userId}}
+    Name: {{name}}
+    <button ion-button (click)="goToNextPage()">Go to Next Page</button>
+  </ion-content>
+  `
+})
+export class SecondPage {
+
+  userId: string;
+  name: string;
+
+  constructor(public navCtrl: NavController, public params: NavParams) {
+  }
+
+  ionViewWillEnter() {
+    this.userId = this.params.data.userId;
+    this.name = this.params.data.name;
+  }
+
+  goToNextPage() {
+    this.navCtrl.push('ThirdPage', { paramOne: 'Oscar Martinez', paramTwo: 'Jim Halpert'});
+  }
+}
diff --git a/src/components/nav/test/simple-nested-navs/pages/third-nav/third-nav.module.ts b/src/components/nav/test/simple-nested-navs/pages/third-nav/third-nav.module.ts
new file mode 100644
index 00000000000..cac1c1ac218
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/pages/third-nav/third-nav.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { ThirdNav } from './third-nav';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(ThirdNav)
+  ],
+  declarations: [
+    ThirdNav
+  ]
+})
+export class ThirdNavModule { }
diff --git a/src/components/nav/test/simple-nested-navs/pages/third-nav/third-nav.ts b/src/components/nav/test/simple-nested-navs/pages/third-nav/third-nav.ts
new file mode 100644
index 00000000000..d17b6919dfb
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/pages/third-nav/third-nav.ts
@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  selector: 'page-home',
+  template: `
+  <ion-nav [root]="rootPage"></ion-nav>
+
+  `
+})
+export class ThirdNav {
+
+  rootPage: any = 'FirstPage';
+  constructor(public navCtrl: NavController) {
+
+  }
+
+}
diff --git a/src/components/nav/test/simple-nested-navs/pages/third-page/third-page.module.ts b/src/components/nav/test/simple-nested-navs/pages/third-page/third-page.module.ts
new file mode 100644
index 00000000000..3ae80405cc0
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/pages/third-page/third-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { ThirdPage } from './third-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(ThirdPage)
+  ],
+  declarations: [
+    ThirdPage
+  ]
+})
+export class ThirdPageModule { }
diff --git a/src/components/nav/test/simple-nested-navs/pages/third-page/third-page.ts b/src/components/nav/test/simple-nested-navs/pages/third-page/third-page.ts
new file mode 100644
index 00000000000..3801549ba0a
--- /dev/null
+++ b/src/components/nav/test/simple-nested-navs/pages/third-page/third-page.ts
@@ -0,0 +1,33 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../..';
+
+@IonicPage({
+  segment: 'thirdPage/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  selector: 'page-home',
+  template: `
+  <ion-header>
+    <ion-navbar>
+      <ion-title>Third Page</ion-title>
+    </ion-navbar>
+  </ion-header>
+  <ion-content>
+    Third Page
+    Param One: {{paramOne}}
+    Param Two: {{paramTwo}}
+  </ion-content>
+  `
+})
+export class ThirdPage {
+
+  paramOne: string;
+  paramTwo: string;
+  constructor(public navCtrl: NavController, public params: NavParams) {
+  }
+
+  ionViewWillEnter() {
+    this.paramOne = this.params.data.paramOne;
+    this.paramTwo = this.params.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/simple-nested-peer-navs/app/app.component.ts b/src/components/nav/test/simple-nested-peer-navs/app/app.component.ts
new file mode 100644
index 00000000000..3337574380a
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/app/app.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  template: `<ion-nav [root]="root"></ion-nav>`
+})
+export class AppComponent {
+  root = 'LoginPage';
+}
diff --git a/src/components/nav/test/simple-nested-peer-navs/app/app.module.ts b/src/components/nav/test/simple-nested-peer-navs/app/app.module.ts
new file mode 100644
index 00000000000..55310fa2157
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/app/app.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent, { swipeBackEnabled: true, preloadModules: true }),
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
diff --git a/src/components/nav/test/simple-nested-peer-navs/app/main.ts b/src/components/nav/test/simple-nested-peer-navs/app/main.ts
new file mode 100644
index 00000000000..6af7a5b2ae8
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/app/main.ts
@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/landing-page/landing-page.module.ts b/src/components/nav/test/simple-nested-peer-navs/pages/landing-page/landing-page.module.ts
new file mode 100644
index 00000000000..ba7d5165e81
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/landing-page/landing-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { LandingPage } from './landing-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(LandingPage)
+  ],
+  declarations: [
+    LandingPage
+  ]
+})
+export class LandingPageModule { }
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/landing-page/landing-page.ts b/src/components/nav/test/simple-nested-peer-navs/pages/landing-page/landing-page.ts
new file mode 100644
index 00000000000..da2c93925c3
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/landing-page/landing-page.ts
@@ -0,0 +1,30 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-header>
+      <ion-navbar>
+        <ion-title>My Super Cool, multi-pane App</ion-title>
+      </ion-navbar>
+    </ion-header>
+    <ion-content>
+      <ion-grid>
+        <ion-row>
+          <ion-col style="height: 1000px; background-color: blue">
+            <ion-nav root="FirstPage" name="left"></ion-nav>
+          </ion-col>
+          <ion-col style="height: 1000px; background-color: green">
+            <ion-nav root="FourthPage" name="right"></ion-nav>
+          </ion-col>
+        </ion-row>
+      </ion-grid>
+    </ion-content>
+  `
+})
+export class LandingPage {
+  constructor(public nav: NavController) {
+  }
+
+}
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/left/first-page/first-page.html b/src/components/nav/test/simple-nested-peer-navs/pages/left/first-page/first-page.html
new file mode 100644
index 00000000000..e82b2f23889
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/left/first-page/first-page.html
@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page One</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Page One</h2>
+  <button ion-button (click)="goToPageTwo()">Go to Page Two</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/left/first-page/first-page.module.ts b/src/components/nav/test/simple-nested-peer-navs/pages/left/first-page/first-page.module.ts
new file mode 100644
index 00000000000..c17e0dde59e
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/left/first-page/first-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FirstPage } from './first-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FirstPage)
+  ],
+  declarations: [
+    FirstPage
+  ]
+})
+export class FirstPageModule { }
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/left/first-page/first-page.ts b/src/components/nav/test/simple-nested-peer-navs/pages/left/first-page/first-page.ts
new file mode 100644
index 00000000000..027607bc6d0
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/left/first-page/first-page.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'first-page.html'
+})
+export class FirstPage {
+  constructor(public nav: NavController) {
+  }
+
+  goToPageTwo() {
+    this.nav.push('SecondPage', { userId: '123', name: 'Michael Scott'});
+  }
+}
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/left/second-page/second-page.html b/src/components/nav/test/simple-nested-peer-navs/pages/left/second-page/second-page.html
new file mode 100644
index 00000000000..39d1124a079
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/left/second-page/second-page.html
@@ -0,0 +1,15 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Two</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Page Two</h2>
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name {{name}}
+  </div>
+  <button ion-button (click)="goToNextPage()">Go to Next</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/left/second-page/second-page.module.ts b/src/components/nav/test/simple-nested-peer-navs/pages/left/second-page/second-page.module.ts
new file mode 100644
index 00000000000..ce824037f89
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/left/second-page/second-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { SecondPage } from './second-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SecondPage)
+  ],
+  declarations: [
+    SecondPage
+  ]
+})
+export class SecondPageModule { }
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/left/second-page/second-page.ts b/src/components/nav/test/simple-nested-peer-navs/pages/left/second-page/second-page.ts
new file mode 100644
index 00000000000..44abf580fe3
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/left/second-page/second-page.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'pageTwo/user/:userId/name/:name'
+})
+@Component({
+  templateUrl: 'second-page.html'
+})
+export class SecondPage {
+
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.userId = this.params.data.userId;
+    this.name = this.params.data.name;
+  }
+
+  goToNextPage() {
+    this.nav.push('ThirdPage', { paramOne: 'mono', paramTwo: 'stereo'});
+  }
+}
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/left/third-page/third-page.html b/src/components/nav/test/simple-nested-peer-navs/pages/left/third-page/third-page.html
new file mode 100644
index 00000000000..af317e8de81
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/left/third-page/third-page.html
@@ -0,0 +1,14 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Three</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page Three
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+    Param Two: {{paramTwo}}
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/left/third-page/third-page.module.ts b/src/components/nav/test/simple-nested-peer-navs/pages/left/third-page/third-page.module.ts
new file mode 100644
index 00000000000..fab76aa598a
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/left/third-page/third-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { ThirdPage } from './third-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(ThirdPage)
+  ],
+  declarations: [
+    ThirdPage
+  ]
+})
+export class ThirdPageModule { }
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/left/third-page/third-page.ts b/src/components/nav/test/simple-nested-peer-navs/pages/left/third-page/third-page.ts
new file mode 100644
index 00000000000..9cbbc0413f8
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/left/third-page/third-page.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams} from '../../../../../../..';
+
+@IonicPage({
+  segment: 'thirdPage/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  templateUrl: 'third-page.html'
+})
+export class ThirdPage {
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.paramOne = params.data.paramOne;
+    this.paramTwo = params.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/login-page/login-page.module.ts b/src/components/nav/test/simple-nested-peer-navs/pages/login-page/login-page.module.ts
new file mode 100644
index 00000000000..e3cbf3d9160
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/login-page/login-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+import { LoginPage } from './login-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(LoginPage)
+  ],
+  declarations: [
+    LoginPage
+  ]
+})
+export class LoginPageModule { }
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/login-page/login-page.ts b/src/components/nav/test/simple-nested-peer-navs/pages/login-page/login-page.ts
new file mode 100644
index 00000000000..3b781c7d4c8
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/login-page/login-page.ts
@@ -0,0 +1,24 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+    <ion-header>
+      <ion-navbar>
+        <ion-title>Login</ion-title>
+      </ion-navbar>
+    </ion-header>
+    <ion-content>
+      <button ion-button (click)="clickMe()">Login</button>
+    </ion-content>
+  `
+})
+export class LoginPage {
+  constructor(public nav: NavController) {
+  }
+
+  clickMe() {
+    this.nav.push('LandingPage');
+  }
+}
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/right/fifth-page/fifth-page.html b/src/components/nav/test/simple-nested-peer-navs/pages/right/fifth-page/fifth-page.html
new file mode 100644
index 00000000000..3a700e617f8
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/right/fifth-page/fifth-page.html
@@ -0,0 +1,15 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Five</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Page Five</h2>
+  <div>
+  User ID: {{userId}}
+  </div>
+  <div>
+  Name {{name}}
+  </div>
+  <button ion-button (click)="goToNextPage()">Go to Next</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/right/fifth-page/fifth-page.module.ts b/src/components/nav/test/simple-nested-peer-navs/pages/right/fifth-page/fifth-page.module.ts
new file mode 100644
index 00000000000..1499d707cf1
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/right/fifth-page/fifth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FifthPage } from './fifth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FifthPage)
+  ],
+  declarations: [
+    FifthPage
+  ]
+})
+export class FifthPageModule { }
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/right/fifth-page/fifth-page.ts b/src/components/nav/test/simple-nested-peer-navs/pages/right/fifth-page/fifth-page.ts
new file mode 100644
index 00000000000..fd3023b1f50
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/right/fifth-page/fifth-page.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'pageFive/user/:userId/name/:name'
+})
+@Component({
+  templateUrl: 'fifth-page.html'
+})
+export class FifthPage {
+
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.userId = this.params.data.userId;
+    this.name = this.params.data.name;
+  }
+
+  goToNextPage() {
+    this.nav.push('SixthPage', { paramOne: 'Tobey', paramTwo: 'Holly'});
+  }
+}
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/right/fouth-page/fourth-page.html b/src/components/nav/test/simple-nested-peer-navs/pages/right/fouth-page/fourth-page.html
new file mode 100644
index 00000000000..a89fef0a4e3
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/right/fouth-page/fourth-page.html
@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Four</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h2>Page Four</h2>
+  <button ion-button (click)="goToPageTwo()">Next</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/right/fouth-page/fourth-page.module.ts b/src/components/nav/test/simple-nested-peer-navs/pages/right/fouth-page/fourth-page.module.ts
new file mode 100644
index 00000000000..d041e3bcc8b
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/right/fouth-page/fourth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FourthPage } from './fourth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FourthPage)
+  ],
+  declarations: [
+    FourthPage
+  ]
+})
+export class FourthPageModule { }
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/right/fouth-page/fourth-page.ts b/src/components/nav/test/simple-nested-peer-navs/pages/right/fouth-page/fourth-page.ts
new file mode 100644
index 00000000000..6ad06442e05
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/right/fouth-page/fourth-page.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'fourth-page.html'
+})
+export class FourthPage {
+  constructor(public nav: NavController) {
+  }
+
+  goToPageTwo() {
+    this.nav.push('FifthPage', { userId: '567', name: 'Pamela Beasley'});
+  }
+}
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/right/sixth-page/sixth-page.html b/src/components/nav/test/simple-nested-peer-navs/pages/right/sixth-page/sixth-page.html
new file mode 100644
index 00000000000..8732947e36a
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/right/sixth-page/sixth-page.html
@@ -0,0 +1,14 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Six</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page Six
+  <div>
+  Param One: {{paramOne}}
+  </div>
+  <div>
+    Param Two: {{paramTwo}}
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/right/sixth-page/sixth-page.module.ts b/src/components/nav/test/simple-nested-peer-navs/pages/right/sixth-page/sixth-page.module.ts
new file mode 100644
index 00000000000..212bd5c889e
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/right/sixth-page/sixth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { SixthPage } from './sixth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SixthPage)
+  ],
+  declarations: [
+    SixthPage
+  ]
+})
+export class SixthPageModule { }
diff --git a/src/components/nav/test/simple-nested-peer-navs/pages/right/sixth-page/sixth-page.ts b/src/components/nav/test/simple-nested-peer-navs/pages/right/sixth-page/sixth-page.ts
new file mode 100644
index 00000000000..6f075c5fa4b
--- /dev/null
+++ b/src/components/nav/test/simple-nested-peer-navs/pages/right/sixth-page/sixth-page.ts
@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams} from '../../../../../../..';
+
+@IonicPage({
+  segment: 'sixthPage/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  templateUrl: 'sixth-page.html'
+})
+export class SixthPage {
+
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, public params: NavParams) {
+    this.paramOne = params.data.paramOne;
+    this.paramTwo = params.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/simple-tabs/app/app.component.ts b/src/components/nav/test/simple-tabs/app/app.component.ts
new file mode 100644
index 00000000000..fc1fdb14daf
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/app/app.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+
+@Component({
+  template: `
+  <ion-tabs name="simple">
+    <ion-tab tabIcon="heart" [root]="tab1" tabTitle="Taco Burrito Enchilada"></ion-tab>
+    <ion-tab tabIcon="star" [root]="tab2"></ion-tab>
+  </ion-tabs>
+  `
+})
+export class AppComponent {
+  tab1 = 'FirstPage';
+  tab2 = 'FourthPage';
+}
diff --git a/src/components/nav/test/simple-tabs/app/app.module.ts b/src/components/nav/test/simple-tabs/app/app.module.ts
new file mode 100644
index 00000000000..55310fa2157
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/app/app.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent, { swipeBackEnabled: true, preloadModules: true }),
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
diff --git a/src/components/nav/test/simple-tabs/app/main.ts b/src/components/nav/test/simple-tabs/app/main.ts
new file mode 100644
index 00000000000..6af7a5b2ae8
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/app/main.ts
@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/components/nav/test/simple-tabs/pages/tab-one/first-page/first-page.html b/src/components/nav/test/simple-tabs/pages/tab-one/first-page/first-page.html
new file mode 100644
index 00000000000..1f117924968
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-one/first-page/first-page.html
@@ -0,0 +1,11 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page One</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page One
+  <div>
+    <button ion-button (click)="clickMe()">Go To Next Page</button>
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-tabs/pages/tab-one/first-page/first-page.module.ts b/src/components/nav/test/simple-tabs/pages/tab-one/first-page/first-page.module.ts
new file mode 100644
index 00000000000..c17e0dde59e
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-one/first-page/first-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FirstPage } from './first-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FirstPage)
+  ],
+  declarations: [
+    FirstPage
+  ]
+})
+export class FirstPageModule { }
diff --git a/src/components/nav/test/simple-tabs/pages/tab-one/first-page/first-page.ts b/src/components/nav/test/simple-tabs/pages/tab-one/first-page/first-page.ts
new file mode 100644
index 00000000000..34103f22d1e
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-one/first-page/first-page.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, } from '../../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'first-page.html'
+})
+export class FirstPage {
+  constructor(public nav: NavController) {
+  }
+
+  clickMe() {
+    this.nav.push('SecondPage', { userId: '123', name: 'Hans Gruber'});
+  }
+}
diff --git a/src/components/nav/test/simple-tabs/pages/tab-one/second-page/second-page.html b/src/components/nav/test/simple-tabs/pages/tab-one/second-page/second-page.html
new file mode 100644
index 00000000000..3b283bfc953
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-one/second-page/second-page.html
@@ -0,0 +1,17 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Two</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page Two
+  <div>
+    UserID: {{userId}}
+  </div>
+  <div>
+    Name: {{name}}
+  </div>
+  <div>
+    <button ion-button (click)="goToNextPage()">Go To Next Page</button>
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-tabs/pages/tab-one/second-page/second-page.module.ts b/src/components/nav/test/simple-tabs/pages/tab-one/second-page/second-page.module.ts
new file mode 100644
index 00000000000..ce824037f89
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-one/second-page/second-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { SecondPage } from './second-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SecondPage)
+  ],
+  declarations: [
+    SecondPage
+  ]
+})
+export class SecondPageModule { }
diff --git a/src/components/nav/test/simple-tabs/pages/tab-one/second-page/second-page.ts b/src/components/nav/test/simple-tabs/pages/tab-one/second-page/second-page.ts
new file mode 100644
index 00000000000..adf2bc09d73
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-one/second-page/second-page.ts
@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'pageTwo/userId/:userId/name/:name'
+})
+@Component({
+  templateUrl: 'second-page.html'
+})
+export class SecondPage {
+
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, public params: NavParams) {
+  }
+
+  ionViewWillEnter() {
+    this.userId = this.params.data.userId;
+    this.name = this.params.data.name;
+  }
+
+  goToNextPage() {
+    this.nav.push('ThirdPage', { paramOne: 'one one one', paramTwo: 'two two two'});
+  }
+}
diff --git a/src/components/nav/test/simple-tabs/pages/tab-one/third-page/third-page.html b/src/components/nav/test/simple-tabs/pages/tab-one/third-page/third-page.html
new file mode 100644
index 00000000000..dabe9013a53
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-one/third-page/third-page.html
@@ -0,0 +1,14 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Three</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page three
+  <div>
+    Param One {{paramOne}}
+  </div>
+  <div>
+    Param Two {{paramTwo}}
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-tabs/pages/tab-one/third-page/third-page.module.ts b/src/components/nav/test/simple-tabs/pages/tab-one/third-page/third-page.module.ts
new file mode 100644
index 00000000000..fab76aa598a
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-one/third-page/third-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { ThirdPage } from './third-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(ThirdPage)
+  ],
+  declarations: [
+    ThirdPage
+  ]
+})
+export class ThirdPageModule { }
diff --git a/src/components/nav/test/simple-tabs/pages/tab-one/third-page/third-page.ts b/src/components/nav/test/simple-tabs/pages/tab-one/third-page/third-page.ts
new file mode 100644
index 00000000000..b3ce5b6571b
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-one/third-page/third-page.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'pageThree/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  templateUrl: 'third-page.html'
+})
+export class ThirdPage {
+
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, public params: NavParams) {
+  }
+
+  ionViewWillEnter() {
+    this.paramOne = this.params.data.paramOne;
+    this.paramTwo = this.params.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/simple-tabs/pages/tab-two/fifth-page/fifth-page.html b/src/components/nav/test/simple-tabs/pages/tab-two/fifth-page/fifth-page.html
new file mode 100644
index 00000000000..210ea4369b5
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-two/fifth-page/fifth-page.html
@@ -0,0 +1,17 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Five</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page Five
+  <div>
+    UserID: {{userId}}
+  </div>
+  <div>
+    Name: {{name}}
+  </div>
+  <div>
+    <button ion-button (click)="goToNextPage()">Go To Next Page</button>
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-tabs/pages/tab-two/fifth-page/fifth-page.module.ts b/src/components/nav/test/simple-tabs/pages/tab-two/fifth-page/fifth-page.module.ts
new file mode 100644
index 00000000000..1499d707cf1
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-two/fifth-page/fifth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FifthPage } from './fifth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FifthPage)
+  ],
+  declarations: [
+    FifthPage
+  ]
+})
+export class FifthPageModule { }
diff --git a/src/components/nav/test/simple-tabs/pages/tab-two/fifth-page/fifth-page.ts b/src/components/nav/test/simple-tabs/pages/tab-two/fifth-page/fifth-page.ts
new file mode 100644
index 00000000000..ffac57cd2e0
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-two/fifth-page/fifth-page.ts
@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'pageFive/userId/:userId/name/:name'
+})
+@Component({
+  templateUrl: 'fifth-page.html'
+})
+export class FifthPage {
+
+  userId: string;
+  name: string;
+  constructor(public nav: NavController, public params: NavParams) {
+  }
+
+  ionViewWillEnter() {
+    this.userId = this.params.data.userId;
+    this.name = this.params.data.name;
+  }
+
+  goToNextPage() {
+    this.nav.push('SixthPage', { paramOne: 'taco taco taco', paramTwo: 'yum yum yum'});
+  }
+}
diff --git a/src/components/nav/test/simple-tabs/pages/tab-two/fourth-page/fourth-page.html b/src/components/nav/test/simple-tabs/pages/tab-two/fourth-page/fourth-page.html
new file mode 100644
index 00000000000..22b994132b6
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-two/fourth-page/fourth-page.html
@@ -0,0 +1,10 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Four</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page Four
+
+  <button ion-button (click)="goToNextPage()">Next Page</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-tabs/pages/tab-two/fourth-page/fourth-page.module.ts b/src/components/nav/test/simple-tabs/pages/tab-two/fourth-page/fourth-page.module.ts
new file mode 100644
index 00000000000..d041e3bcc8b
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-two/fourth-page/fourth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { FourthPage } from './fourth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(FourthPage)
+  ],
+  declarations: [
+    FourthPage
+  ]
+})
+export class FourthPageModule { }
diff --git a/src/components/nav/test/simple-tabs/pages/tab-two/fourth-page/fourth-page.ts b/src/components/nav/test/simple-tabs/pages/tab-two/fourth-page/fourth-page.ts
new file mode 100644
index 00000000000..2efc7c0973d
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-two/fourth-page/fourth-page.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+})
+@Component({
+  templateUrl: 'fourth-page.html'
+})
+export class FourthPage {
+
+  constructor(public nav: NavController, public params: NavParams) {
+  }
+
+  goToNextPage() {
+    this.nav.push('FifthPage', { userId: '456', name: 'Stanley Hudson'});
+  }
+}
diff --git a/src/components/nav/test/simple-tabs/pages/tab-two/sixth-page/sixth-page.html b/src/components/nav/test/simple-tabs/pages/tab-two/sixth-page/sixth-page.html
new file mode 100644
index 00000000000..a150a262df0
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-two/sixth-page/sixth-page.html
@@ -0,0 +1,14 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page Six</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  Page Six
+  <div>
+    Param One {{paramOne}}
+  </div>
+  <div>
+    Param Two {{paramTwo}}
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/nav/test/simple-tabs/pages/tab-two/sixth-page/sixth-page.module.ts b/src/components/nav/test/simple-tabs/pages/tab-two/sixth-page/sixth-page.module.ts
new file mode 100644
index 00000000000..212bd5c889e
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-two/sixth-page/sixth-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../../..';
+import { SixthPage } from './sixth-page';
+
+@NgModule({
+  imports: [
+    IonicPageModule.forChild(SixthPage)
+  ],
+  declarations: [
+    SixthPage
+  ]
+})
+export class SixthPageModule { }
diff --git a/src/components/nav/test/simple-tabs/pages/tab-two/sixth-page/sixth-page.ts b/src/components/nav/test/simple-tabs/pages/tab-two/sixth-page/sixth-page.ts
new file mode 100644
index 00000000000..f7529f44022
--- /dev/null
+++ b/src/components/nav/test/simple-tabs/pages/tab-two/sixth-page/sixth-page.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from '../../../../../../..';
+
+@IonicPage({
+  segment: 'pageSix/paramOne/:paramOne/paramTwo/:paramTwo'
+})
+@Component({
+  templateUrl: 'sixth-page.html'
+})
+export class SixthPage {
+
+  paramOne: string;
+  paramTwo: string;
+  constructor(public nav: NavController, public params: NavParams) {
+  }
+
+  ionViewWillEnter() {
+    this.paramOne = this.params.data.paramOne;
+    this.paramTwo = this.params.data.paramTwo;
+  }
+}
diff --git a/src/components/nav/test/worst-case/app.module.ts b/src/components/nav/test/worst-case/app.module.ts
index 0f8626ccff9..23d44dc10d5 100644
--- a/src/components/nav/test/worst-case/app.module.ts
+++ b/src/components/nav/test/worst-case/app.module.ts
@@ -125,7 +125,7 @@ export class Page4 extends Base {
   }
 
   doSomethingSync() {
-		// this is a long running synchronous task
+    // this is a long running synchronous task
     // (imagine that a huge data must be transformed here recuresively or something similar)
     console.log('START DOING SOMETHING');
     console.time('DO SOMETHING EXPENSIVE SYNCHRONOUSLY');
diff --git a/src/components/picker/picker-column.ts b/src/components/picker/picker-column.ts
index 940abdd3142..5490bf638cb 100644
--- a/src/components/picker/picker-column.ts
+++ b/src/components/picker/picker-column.ts
@@ -4,7 +4,7 @@ import { clamp } from '../../util/util';
 import { Config } from '../../config/config';
 import { DomController, DomDebouncer } from '../../platform/dom-controller';
 import { Haptic } from '../../tap-click/haptic';
-import { PickerColumn, DECELERATION_FRICTION, FRAME_MS, MAX_PICKER_SPEED, PICKER_OPT_SELECTED } from './picker-options';
+import { DECELERATION_FRICTION, FRAME_MS, MAX_PICKER_SPEED, PICKER_OPT_SELECTED, PickerColumn } from './picker-options';
 import { Platform } from '../../platform/platform';
 import { pointerCoord } from '../../util/dom';
 import { UIEventManager } from '../../gestures/ui-event-manager';
diff --git a/src/components/picker/picker-component.ts b/src/components/picker/picker-component.ts
index 3bafcf4b494..4492421c18f 100644
--- a/src/components/picker/picker-component.ts
+++ b/src/components/picker/picker-component.ts
@@ -1,13 +1,12 @@
 import { Component, ElementRef, HostListener, QueryList, Renderer, ViewChildren, ViewEncapsulation } from '@angular/core';
 
-import { isNumber, isPresent, isString, assert } from '../../util/util';
+import { assert, isNumber, isPresent, isString } from '../../util/util';
 import { Config } from '../../config/config';
-import { GestureController, BlockerDelegate, BLOCK_ALL } from '../../gestures/gesture-controller';
+import { BLOCK_ALL, BlockerDelegate, GestureController, } from '../../gestures/gesture-controller';
 import { KEY_ENTER, KEY_ESCAPE } from '../../platform/key';
 import { NavParams } from '../../navigation/nav-params';
 import { Picker } from './picker';
-import { PickerOptions, PickerColumnOption } from './picker-options';
-import { Platform } from '../../platform/platform';
+import { PickerColumnOption, PickerOptions } from './picker-options';
 import { ViewController } from '../../navigation/view-controller';
 
 import { PickerColumnCmp } from './picker-column';
@@ -53,7 +52,6 @@ export class PickerCmp {
     private _viewCtrl: ViewController,
     private _elementRef: ElementRef,
     config: Config,
-    private _plt: Platform,
     gestureCtrl: GestureController,
     params: NavParams,
     renderer: Renderer
@@ -133,7 +131,7 @@ export class PickerCmp {
     this._cols.forEach(column => column.refresh());
   }
 
-  _colChange(selectedOption: PickerColumnOption) {
+  _colChange() {
     // one of the columns has changed its selected index
     var picker = <Picker>this._viewCtrl;
     picker.ionChange.emit(this.getSelected());
@@ -161,8 +159,6 @@ export class PickerCmp {
   }
 
   ionViewDidEnter() {
-    this._plt.focusOutActiveElement();
-
     let focusableEle = this._elementRef.nativeElement.querySelector('button');
     if (focusableEle) {
       focusableEle.focus();
diff --git a/src/components/picker/picker.ts b/src/components/picker/picker.ts
index c132439fb3c..341d78413f0 100644
--- a/src/components/picker/picker.ts
+++ b/src/components/picker/picker.ts
@@ -2,10 +2,10 @@ import { EventEmitter, Output } from '@angular/core';
 
 import { App } from '../app/app';
 import { Config } from '../../config/config';
-import { isPresent, assert } from '../../util/util';
+import { assert, isPresent } from '../../util/util';
 import { NavOptions } from '../../navigation/nav-util';
 import { PickerCmp } from './picker-component';
-import { PickerOptions, PickerColumn } from './picker-options';
+import { PickerColumn, PickerOptions } from './picker-options';
 import { PickerSlideIn, PickerSlideOut } from './picker-transitions';
 import { ViewController } from '../../navigation/view-controller';
 
diff --git a/src/components/popover/popover-component.ts b/src/components/popover/popover-component.ts
index 275f005627b..1d3525c06c5 100644
--- a/src/components/popover/popover-component.ts
+++ b/src/components/popover/popover-component.ts
@@ -3,9 +3,8 @@ import { Component, ComponentFactoryResolver, ElementRef, HostListener, Renderer
 import { Config } from '../../config/config';
 import { KEY_ESCAPE } from '../../platform/key';
 import { NavParams } from '../../navigation/nav-params';
-import { Platform } from '../../platform/platform';
 import { ViewController } from '../../navigation/view-controller';
-import { GestureController, BlockerDelegate, BLOCK_ALL } from '../../gestures/gesture-controller';
+import { BLOCK_ALL, BlockerDelegate, GestureController } from '../../gestures/gesture-controller';
 import { ModuleLoader } from '../../util/module-loader';
 import { assert } from '../../util/util';
 
@@ -45,7 +44,6 @@ export class PopoverCmp {
     public _elementRef: ElementRef,
     public _renderer: Renderer,
     public _config: Config,
-    private _plt: Platform,
     public _navParams: NavParams,
     public _viewCtrl: ViewController,
     gestureCtrl: GestureController,
@@ -67,7 +65,6 @@ export class PopoverCmp {
   }
 
   ionViewPreLoad() {
-    this._plt.focusOutActiveElement();
     this._load(this._navParams.data.component);
   }
 
diff --git a/src/components/popover/popover-impl.ts b/src/components/popover/popover-impl.ts
index 752dd2dec1b..8065bd2aff8 100644
--- a/src/components/popover/popover-impl.ts
+++ b/src/components/popover/popover-impl.ts
@@ -4,7 +4,7 @@ import { isPresent } from '../../util/util';
 import { NavOptions } from '../../navigation/nav-util';
 import { PopoverCmp } from './popover-component';
 import { PopoverOptions } from './popover-options';
-import { PopoverPopIn, PopoverPopOut, PopoverMdPopIn, PopoverMdPopOut } from './popover-transitions';
+import { PopoverMdPopIn, PopoverMdPopOut, PopoverPopIn, PopoverPopOut } from './popover-transitions';
 import { ViewController } from '../../navigation/view-controller';
 
 
diff --git a/src/components/popover/test/basic/pages/page-one/page-one.ts b/src/components/popover/test/basic/pages/page-one/page-one.ts
index e1355283fcf..22997f2eded 100644
--- a/src/components/popover/test/basic/pages/page-one/page-one.ts
+++ b/src/components/popover/test/basic/pages/page-one/page-one.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, ElementRef } from '@angular/core';
+import { Component, ElementRef, ViewChild } from '@angular/core';
 
 import { IonicPage, PopoverController } from '../../../../../..';
 
diff --git a/src/components/radio/radio-button.ts b/src/components/radio/radio-button.ts
index a4cb35e370f..e030d71d2aa 100644
--- a/src/components/radio/radio-button.ts
+++ b/src/components/radio/radio-button.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, EventEmitter, HostListener, Input, OnInit, OnDestroy, Optional, Output, Renderer, ViewEncapsulation } from '@angular/core';
+import { Component, ElementRef, EventEmitter, HostListener, Input, OnDestroy, OnInit, Optional, Output, Renderer, ViewEncapsulation } from '@angular/core';
 
 import { Config } from '../../config/config';
 import { Form, IonicTapInput } from '../../util/form';
diff --git a/src/components/radio/test/radio.spec.ts b/src/components/radio/test/radio.spec.ts
index c3fbcac9545..d0a3595f55e 100644
--- a/src/components/radio/test/radio.spec.ts
+++ b/src/components/radio/test/radio.spec.ts
@@ -1,7 +1,7 @@
 import { RadioGroup } from '../radio-group';
 import { RadioButton } from '../radio-button';
 import { Form } from '../../../util/form';
-import { mockChangeDetectorRef, mockConfig, mockRenderer, mockElementRef } from '../../../util/mock-providers';
+import { mockChangeDetectorRef, mockConfig, mockElementRef, mockRenderer } from '../../../util/mock-providers';
 
 
 describe('RadioGroup', () => {
diff --git a/src/components/range/range-knob.ts b/src/components/range/range-knob.ts
index 4ed49d12b88..54aa3c9a5a2 100644
--- a/src/components/range/range-knob.ts
+++ b/src/components/range/range-knob.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, HostListener, Input, Output } from '@angular/core';
 
-import { KEY_LEFT, KEY_RIGHT, KEY_UP, KEY_DOWN } from '../../platform/key';
+import { KEY_DOWN, KEY_LEFT, KEY_RIGHT, KEY_UP } from '../../platform/key';
 
 /**
  * @hidden
diff --git a/src/components/range/test/range.spec.ts b/src/components/range/test/range.spec.ts
index 4e1855e6fa0..7b94afd69e1 100644
--- a/src/components/range/test/range.spec.ts
+++ b/src/components/range/test/range.spec.ts
@@ -1,7 +1,7 @@
 import { Range } from '../range';
-import { mockChangeDetectorRef, mockConfig, mockDomController, mockItem, mockElementRef, mockHaptic, mockPlatform, mockRenderer } from '../../../util/mock-providers';
+import { mockChangeDetectorRef, mockConfig, mockDomController, mockElementRef, mockHaptic, mockItem, mockPlatform, mockRenderer } from '../../../util/mock-providers';
 import { Form } from '../../../util/form';
-import { commonInputTest, NUMBER_CORPUS } from '../../../util/input-tester';
+import { NUMBER_CORPUS, commonInputTest } from '../../../util/input-tester';
 
 
 describe('Range', () => {
diff --git a/src/components/refresher/refresher.ts b/src/components/refresher/refresher.ts
index d22114311e7..cfa897a7ca8 100644
--- a/src/components/refresher/refresher.ts
+++ b/src/components/refresher/refresher.ts
@@ -1,7 +1,7 @@
 import { Directive, EventEmitter, Host, Input, NgZone, Output } from '@angular/core';
 
 import { Content } from '../content/content';
-import { GestureController, GestureDelegate, GESTURE_PRIORITY_REFRESHER, GESTURE_REFRESHER } from '../../gestures/gesture-controller';
+import { GESTURE_PRIORITY_REFRESHER, GESTURE_REFRESHER, GestureController, GestureDelegate } from '../../gestures/gesture-controller';
 import { isTrueProperty } from '../../util/util';
 import { Platform } from '../../platform/platform';
 import { pointerCoord } from '../../util/dom';
@@ -202,7 +202,7 @@ export class Refresher {
 
   constructor(private _plt: Platform, @Host() private _content: Content, private _zone: NgZone, gestureCtrl: GestureController) {
     this._events = new UIEventManager(_plt);
-    _content.setElementClass('has-refresher', true);
+    _content._hasRefresher = true;
     this._gesture = gestureCtrl.createGesture({
       name: GESTURE_REFRESHER,
       priority: GESTURE_PRIORITY_REFRESHER
diff --git a/src/components/refresher/test/basic/app.module.ts b/src/components/refresher/test/basic/app.module.ts
index caa5d0189f0..55c456e9c78 100644
--- a/src/components/refresher/test/basic/app.module.ts
+++ b/src/components/refresher/test/basic/app.module.ts
@@ -28,7 +28,7 @@ export class Page1 {
     });
   }
 
-  doStart(refresher: Refresher) {
+  doStart() {
     console.info('Refresher, start');
   }
 
diff --git a/src/components/refresher/test/navigation/app.module.ts b/src/components/refresher/test/navigation/app.module.ts
index bde5f1c19cd..84d7063bdad 100644
--- a/src/components/refresher/test/navigation/app.module.ts
+++ b/src/components/refresher/test/navigation/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Refresher, NavController } from '../../../..';
+import { IonicApp, IonicModule, NavController, Refresher } from '../../../..';
 
 
 @Component({
@@ -27,7 +27,7 @@ export class Page1 {
     });
   }
 
-  doStart(refresher: Refresher) {
+  doStart() {
     console.info('Refresher, start');
   }
 
diff --git a/src/components/refresher/test/refresher.spec.ts b/src/components/refresher/test/refresher.spec.ts
index 6d787c6de84..8f94b5aeb83 100644
--- a/src/components/refresher/test/refresher.spec.ts
+++ b/src/components/refresher/test/refresher.spec.ts
@@ -224,6 +224,9 @@ describe('Refresher', () => {
 
   });
 
+  it('should set hasRefresher on content', () => {
+    expect(content._hasRefresher).toBeTruthy();
+  });
 
   let contentElementRef: any;
   let refresher: Refresher;
diff --git a/src/components/scroll/scroll.ts b/src/components/scroll/scroll.ts
index 8dda0faef3c..fae752bc3b1 100644
--- a/src/components/scroll/scroll.ts
+++ b/src/components/scroll/scroll.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, ElementRef, Input, ViewChild, ViewEncapsulation } from '@angular/core';
 
-import { isTrueProperty, assert } from '../../util/util';
+import { assert, isTrueProperty } from '../../util/util';
 
 /**
  * @name Scroll
diff --git a/src/components/searchbar/searchbar.ts b/src/components/searchbar/searchbar.ts
index 6467c2d3fe1..d9510ba7fcd 100644
--- a/src/components/searchbar/searchbar.ts
+++ b/src/components/searchbar/searchbar.ts
@@ -188,10 +188,11 @@ export class Searchbar extends BaseInput<string> {
    */
   _inputUpdated() {
     const ele = this._searchbarInput.nativeElement;
+    const value = this._value;
     // It is important not to re-assign the value if it is the same, because,
     // otherwise, the caret is moved to the end of the input
-    if (ele && ele.value !== this.value) {
-      ele.value = this.value;
+    if (ele.value !== value) {
+      ele.value = value;
     }
     this.positionElements();
   }
diff --git a/src/components/searchbar/test/basic/pages/root-page/root-page.ts b/src/components/searchbar/test/basic/pages/root-page/root-page.ts
index 093582aa0b5..92f50f12e98 100644
--- a/src/components/searchbar/test/basic/pages/root-page/root-page.ts
+++ b/src/components/searchbar/test/basic/pages/root-page/root-page.ts
@@ -1,4 +1,4 @@
-import { Component, ChangeDetectorRef } from '@angular/core';
+import { ChangeDetectorRef, Component } from '@angular/core';
 import { IonicPage } from '../../../../../..';
 
 @IonicPage()
diff --git a/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts b/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts
index dace0d2c72b..d51a576940e 100644
--- a/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts
+++ b/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts
@@ -8,7 +8,7 @@ import { IonicPage, NavParams } from '../../../../../..';
 export class DetailPage {
   city: string;
 
-  constructor(private _navParams: NavParams) {
+  constructor(_navParams: NavParams) {
     this.city = _navParams.get('city');
   }
 }
diff --git a/src/components/searchbar/test/nav/pages/search-page/search-page.ts b/src/components/searchbar/test/nav/pages/search-page/search-page.ts
index 54049475ea1..7d598e5efa2 100644
--- a/src/components/searchbar/test/nav/pages/search-page/search-page.ts
+++ b/src/components/searchbar/test/nav/pages/search-page/search-page.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { IonicPage, NavController, ModalController } from '../../../../../..';
+import { IonicPage, ModalController, NavController } from '../../../../../..';
 
 @IonicPage()
 @Component({
diff --git a/src/components/segment/test/swipe/pages/e2e-page/e2e-page.ts b/src/components/segment/test/swipe/pages/e2e-page/e2e-page.ts
index c7ad32d6e39..07489066666 100644
--- a/src/components/segment/test/swipe/pages/e2e-page/e2e-page.ts
+++ b/src/components/segment/test/swipe/pages/e2e-page/e2e-page.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild } from '@angular/core';
-import { Slides, SegmentButton } from '../../../../../..';
+import { SegmentButton, Slides } from '../../../../../..';
 
 
 @Component({
diff --git a/src/components/select/select.ts b/src/components/select/select.ts
index efcd3e0cfe5..1c37f89e465 100644
--- a/src/components/select/select.ts
+++ b/src/components/select/select.ts
@@ -1,4 +1,4 @@
-import { Component, ContentChildren, ElementRef, EventEmitter, Input, HostListener, OnDestroy, Optional, Output, Renderer, QueryList, ViewEncapsulation } from '@angular/core';
+import { Component, ContentChildren, ElementRef, EventEmitter, HostListener, Input, OnDestroy, Optional, Output, QueryList, Renderer, ViewEncapsulation } from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
 
 import { ActionSheet } from '../action-sheet/action-sheet';
@@ -9,7 +9,7 @@ import { Config } from '../../config/config';
 import { DeepLinker } from '../../navigation/deep-linker';
 import { Form } from '../../util/form';
 import { BaseInput } from '../../util/base-input';
-import { isCheckedProperty, isTrueProperty, deepCopy, deepEqual, assert } from '../../util/util';
+import { assert, deepCopy, deepEqual, isCheckedProperty, isTrueProperty } from '../../util/util';
 import { Item } from '../item/item';
 import { Option } from '../option/option';
 import { SelectPopover, SelectPopoverOption } from './select-popover-component';
@@ -123,6 +123,31 @@ import { SelectPopover, SelectPopoverOption } from './select-popover-component';
  * };
  * ```
  *
+ * ### Object Value References
+ *
+ * When using objects for select values, it is possible for the identities of these objects to
+ * change if they are coming from a server or database, while the selected value's identity
+ * remains the same. For example, this can occur when an existing record with the desired object value
+ * is loaded into the select, but the newly retrieved select options now have different identities. This will
+ * result in the select appearing to have no value at all, even though the original selection in still intact.
+ *
+ * Using the `compareWith` `Input` is the solution to this problem
+ *
+ * ```html
+ * <ion-item>
+ *   <ion-label>Employee</ion-label>
+ *   <ion-select [(ngModel)]="employee" [compareWith]="compareFn">
+ *     <ion-option *ngFor="let employee of employees" [value]="employee">{{employee.name}}</ion-option>
+ *   </ion-select>
+ * </ion-item>
+ * ```
+ *
+ * ```ts
+ * compareFn(e1: Employee, e2: Employee): boolean {
+ *   return e1 && e2 ? e1.id === e2.id : e1 === e2;
+ * }
+ * ```
+ *
  * @demo /docs/demos/src/select/
  */
 @Component({
@@ -134,6 +159,7 @@ import { SelectPopover, SelectPopoverOption } from './select-popover-component';
       '<div class="select-icon-inner"></div>' +
     '</div>' +
     '<button aria-haspopup="true" ' +
+            'type="button" ' +
             '[id]="id" ' +
             'ion-button="item-cover" ' +
             '[attr.aria-labelledby]="_labelId" ' +
@@ -153,6 +179,7 @@ export class Select extends BaseInput<any> implements OnDestroy {
   _overlay: ActionSheet | Alert | Popover;
   _texts: string[] = [];
   _text: string = '';
+  _compareWith: (o1: any, o2: any) => boolean = isCheckedProperty;
 
   /**
    * @input {string} The text to display on the cancel button. Default: `Cancel`.
@@ -187,6 +214,18 @@ export class Select extends BaseInput<any> implements OnDestroy {
    */
   @Input() selectedText: string = '';
 
+  /**
+   * @input {Function} The function that will be called to compare object values
+   */
+  @Input()
+  set compareWith(fn: (o1: any, o2: any) => boolean) {
+    if (typeof fn !== 'function') {
+      throw new Error(`compareWith must be a function, but received ${JSON.stringify(fn)}`);
+    }
+    this._compareWith = fn;
+  }
+
+
   /**
    * @output {any} Emitted when the selection was cancelled.
    */
@@ -206,10 +245,6 @@ export class Select extends BaseInput<any> implements OnDestroy {
 
   @HostListener('click', ['$event'])
   _click(ev: UIEvent) {
-    if (ev.detail === 0) {
-      // do not continue if the click event came from a form submit
-      return;
-    }
     ev.preventDefault();
     ev.stopPropagation();
     this.open(ev);
@@ -345,7 +380,7 @@ export class Select extends BaseInput<any> implements OnDestroy {
         };
       });
 
-      var selectCssClass = 'select-alert';
+      let selectCssClass = 'select-alert';
 
       // create the alert instance from our built up selectOptions
       overlay = new Alert(this._app, selectOptions, this.config);
@@ -426,7 +461,7 @@ export class Select extends BaseInput<any> implements OnDestroy {
       // we use writeValue() because we don't want to update ngModel
       this.writeValue(val.filter(o => o.selected).map(o => o.value));
     } else {
-      this._inputUpdated();
+      this._updateText();
     }
   }
 
@@ -445,14 +480,14 @@ export class Select extends BaseInput<any> implements OnDestroy {
   /**
    * @hidden
    */
-  _inputUpdated() {
+  _updateText() {
     this._texts.length = 0;
 
     if (this._options) {
       this._options.forEach(option => {
         // check this option if the option's value is in the values array
         option.selected = this.getValues().some(selectValue => {
-          return isCheckedProperty(selectValue, option.value);
+          return this._compareWith(selectValue, option.value);
         });
 
         if (option.selected) {
@@ -464,4 +499,12 @@ export class Select extends BaseInput<any> implements OnDestroy {
     this._text = this._texts.join(', ');
   }
 
+  /**
+   * @hidden
+   */
+  _inputUpdated() {
+    this._updateText();
+    super._inputUpdated();
+  }
+
 }
diff --git a/src/components/select/test/single-value/pages/page-one/page-one.html b/src/components/select/test/single-value/pages/page-one/page-one.html
index 4852b271740..566fab14781 100644
--- a/src/components/select/test/single-value/pages/page-one/page-one.html
+++ b/src/components/select/test/single-value/pages/page-one/page-one.html
@@ -10,7 +10,7 @@
 <ion-content class="outer-content">
 
   <ion-item>
-    <ion-label>Gender</ion-label>
+    <ion-label stacked>Gender</ion-label>
     <ion-select [(ngModel)]="gender" class="e2eSelectGender">
       <ion-option value="f">Female</ion-option>
       <ion-option value="m">Male</ion-option>
@@ -39,7 +39,7 @@
   </ion-item>
 
   <ion-item>
-    <ion-label>Operating System</ion-label>
+    <ion-label floating>Operating System</ion-label>
     <ion-select [(ngModel)]="os" interface="alert" submitText="Okay" cancelText="Nah">
       <ion-option value="dos">DOS</ion-option>
       <ion-option value="lunix">Linux</ion-option>
diff --git a/src/components/slides/slides.ts b/src/components/slides/slides.ts
index 5b8f35de51c..172f2ea68e9 100644
--- a/src/components/slides/slides.ts
+++ b/src/components/slides/slides.ts
@@ -8,7 +8,16 @@ import { initEvents } from './swiper/swiper-events';
 import { initZoom } from './swiper/swiper-zoom';
 import { Platform } from '../../platform/platform';
 import { SlideContainer, SlideElement, SlideTouchEvents, SlideTouches, SlideZoom } from './swiper/swiper-interfaces';
-import { slideTo, slideNext, slidePrev, update, initSwiper, destroySwiper, startAutoplay, stopAutoplay } from './swiper/swiper';
+import {
+  destroySwiper,
+  initSwiper,
+  slideNext,
+  slidePrev,
+  slideTo,
+  startAutoplay,
+  stopAutoplay,
+  update,
+} from './swiper/swiper';
 import { SWIPER_EFFECTS } from './swiper/swiper-effects';
 import { ViewController } from '../../navigation/view-controller';
 
@@ -369,7 +378,7 @@ export class Slides extends Ion {
   }
   private _slidesPerView: number|string = 1;
 
-  /** 
+  /**
    * @input {boolean} Center a slide in the middle of the screen.
    */
   @Input()
diff --git a/src/components/slides/swiper/swiper-a11y.ts b/src/components/slides/swiper/swiper-a11y.ts
index f037e3bc200..d892b099af9 100755
--- a/src/components/slides/swiper/swiper-a11y.ts
+++ b/src/components/slides/swiper/swiper-a11y.ts
@@ -73,7 +73,7 @@ export function ariaHidden(ele: HTMLElement, isHidden: boolean) {
   }
 }
 
-function onEnterKey(s: Slides, event: KeyboardEvent) {
+function onEnterKey(_: Slides, __: KeyboardEvent) {
   // if (event.keyCode !== 13) return;
 
   // const target: HTMLElement = <any>event.target;
diff --git a/src/components/slides/swiper/swiper-classes.ts b/src/components/slides/swiper/swiper-classes.ts
index 21cbe3b8ca6..130c01933f2 100644
--- a/src/components/slides/swiper/swiper-classes.ts
+++ b/src/components/slides/swiper/swiper-classes.ts
@@ -1,5 +1,5 @@
 import { ariaDisable, ariaHidden } from './swiper-a11y';
-import { addClass, removeClass, queryChildren, CLS } from './swiper-utils';
+import { CLS, addClass, queryChildren, removeClass } from './swiper-utils';
 import { Slides } from '../slides';
 import { updatePaginationClasses } from './swiper-pagination';
 
diff --git a/src/components/slides/swiper/swiper-controller.ts b/src/components/slides/swiper/swiper-controller.ts
index 515e31d5493..d833dde1b44 100644
--- a/src/components/slides/swiper/swiper-controller.ts
+++ b/src/components/slides/swiper/swiper-controller.ts
@@ -10,7 +10,7 @@ import { updateProgress } from './swiper-progress';
   Controller
   ===========================*/
 export const SWIPER_CONTROLLER = {
-  LinearSpline: function (s: Slides, plt: Platform, x: any, y: any) {
+  LinearSpline: function (_s: Slides, _platform: Platform, x: any, y: any) {
     this.x = x;
     this.y = y;
     this.lastIndex = x.length - 1;
diff --git a/src/components/slides/swiper/swiper-effects.ts b/src/components/slides/swiper/swiper-effects.ts
index daa53600733..31375cc0d45 100755
--- a/src/components/slides/swiper/swiper-effects.ts
+++ b/src/components/slides/swiper/swiper-effects.ts
@@ -1,6 +1,6 @@
 import { SlideEffects } from './swiper-interfaces';
-import { isHorizontal, transform, transition, eachChild, triggerTransitionEnd, CLS } from './swiper-utils';
-import { isSafari, isIosUIWebView } from '../../../platform/platform-utils';
+import { CLS, eachChild, isHorizontal, transform, transition, triggerTransitionEnd } from './swiper-utils';
+import { isIosUIWebView, isSafari } from '../../../platform/platform-utils';
 
 
 /*=========================
@@ -37,7 +37,7 @@ export const SWIPER_EFFECTS: SlideEffects = {
       if (s.virtualTranslate && duration !== 0) {
         var eventTriggered = false;
 
-        for (var i = 0; i < slides.length; i++) {
+        for (let i = 0; i < slides.length; i++) {
           plt.transitionEnd(slides[i], () => {
             if (eventTriggered || !s) return;
 
@@ -237,7 +237,7 @@ export const SWIPER_EFFECTS: SlideEffects = {
       var zFactor = (isSafari(plt) || isIosUIWebView(plt)) ? (-s._renderedSize / 2) : 0;
       transform(s._wrapper, 'translate3d(0px,0,' + zFactor + 'px) rotateX(' + (isHorizontal(s) ? 0 : wrapperRotate) + 'deg) rotateY(' + (isHorizontal(s) ? -wrapperRotate : 0) + 'deg)');
     },
-    setTransition: function (s, plt, duration) {
+    setTransition: function (s, _plt, duration) {
       for (var i = 0; i < s._slides.length; i++) {
         var slide = s._slides[i];
         transition(slide, duration);
@@ -315,7 +315,7 @@ export const SWIPER_EFFECTS: SlideEffects = {
         }
       }
     },
-    setTransition: function (s, plt, duration) {
+    setTransition: function (s, _plt, duration) {
       for (var i = 0; i < s._slides.length; i++) {
         var slide = s._slides[i];
         transition(slide, duration);
diff --git a/src/components/slides/swiper/swiper-events.ts b/src/components/slides/swiper/swiper-events.ts
index 8a9623d620f..6d74fbcc9df 100644
--- a/src/components/slides/swiper/swiper-events.ts
+++ b/src/components/slides/swiper/swiper-events.ts
@@ -1,8 +1,22 @@
 import { Slides } from '../slides';
-import { SlideUIEvent, SlideElement } from './swiper-interfaces';
-import { maxTranslate, minTranslate, isFormElement, isHorizontal, getElementIndex, triggerTransitionEnd, CLS } from './swiper-utils';
-import { getWrapperTranslate, setWrapperTranslate, setWrapperTransition } from './swiper-transition';
-import { currentSlidesPerView, fixLoop, slideNext, slidePrev, slideTo, slideReset, stopAutoplay, pauseAutoplay, updateAutoHeight, updateContainerSize, updateSlidesSize, onTransitionStart, onTransitionEnd } from './swiper';
+import { SlideElement, SlideUIEvent } from './swiper-interfaces';
+import { CLS, getElementIndex, isFormElement, isHorizontal, maxTranslate, minTranslate, triggerTransitionEnd,  } from './swiper-utils';
+import { getWrapperTranslate, setWrapperTransition, setWrapperTranslate } from './swiper-transition';
+import {
+  currentSlidesPerView,
+  fixLoop,
+  onTransitionEnd,
+  onTransitionStart,
+  pauseAutoplay,
+  slideNext,
+  slidePrev,
+  slideReset,
+  slideTo,
+  stopAutoplay,
+  updateAutoHeight,
+  updateContainerSize,
+  updateSlidesSize,
+} from './swiper';
 import { updateProgress } from './swiper-progress';
 import { updateActiveIndex } from './swiper-index';
 import { updatePagination } from './swiper-pagination';
diff --git a/src/components/slides/swiper/swiper-keyboard.ts b/src/components/slides/swiper/swiper-keyboard.ts
index 0c05edae008..469ae2e6224 100755
--- a/src/components/slides/swiper/swiper-keyboard.ts
+++ b/src/components/slides/swiper/swiper-keyboard.ts
@@ -1,6 +1,6 @@
 import { Slides } from '../slides';
 import { Platform } from '../../../platform/platform';
-import { isHorizontal, offset, CLS } from './swiper-utils';
+import { CLS, isHorizontal, offset } from './swiper-utils';
 import { slideNext, slidePrev } from './swiper';
 
 
diff --git a/src/components/slides/swiper/swiper-pagination.ts b/src/components/slides/swiper/swiper-pagination.ts
index 8a1e82793f4..c57419bfa17 100644
--- a/src/components/slides/swiper/swiper-pagination.ts
+++ b/src/components/slides/swiper/swiper-pagination.ts
@@ -1,4 +1,4 @@
-import { addClass, eachChild, isHorizontal, removeClass, transform, transition, CLS } from './swiper-utils';
+import { CLS, addClass, eachChild, isHorizontal, removeClass, transform, transition } from './swiper-utils';
 import { Slides } from '../slides';
 
 
diff --git a/src/components/slides/swiper/swiper-progress.ts b/src/components/slides/swiper/swiper-progress.ts
index b36b9e0f5ad..7d2c63143eb 100644
--- a/src/components/slides/swiper/swiper-progress.ts
+++ b/src/components/slides/swiper/swiper-progress.ts
@@ -1,5 +1,5 @@
 import { Slides } from '../slides';
-import { maxTranslate, minTranslate, removeClass, updateSlidesOffset, CLS } from './swiper-utils';
+import { CLS, maxTranslate, minTranslate, removeClass, updateSlidesOffset } from './swiper-utils';
 
 
 export function updateProgress(s: Slides, translate?: number) {
diff --git a/src/components/slides/swiper/swiper-transition.ts b/src/components/slides/swiper/swiper-transition.ts
index 8667a9b589a..036d85f84e3 100644
--- a/src/components/slides/swiper/swiper-transition.ts
+++ b/src/components/slides/swiper/swiper-transition.ts
@@ -1,5 +1,5 @@
 import { Slides } from '../slides';
-import { isHorizontal, round, transform, transition, maxTranslate, minTranslate } from './swiper-utils';
+import { isHorizontal, maxTranslate, minTranslate, round, transform, transition } from './swiper-utils';
 import { parallaxSetTransition, parallaxSetTranslate } from './swiper-parallax';
 import { Platform } from '../../../platform/platform';
 import { updateProgress } from './swiper-progress';
diff --git a/src/components/slides/swiper/swiper-utils.ts b/src/components/slides/swiper/swiper-utils.ts
index 423b5cca19a..4802f9f0c10 100644
--- a/src/components/slides/swiper/swiper-utils.ts
+++ b/src/components/slides/swiper/swiper-utils.ts
@@ -15,7 +15,7 @@ export function inlineStyle(ele: any, styles: any) {
 
     } else if (ele.nodeType) {
       var cssProps = Object.keys(styles);
-      for (var i = 0; i < cssProps.length; i++) {
+      for (let i = 0; i < cssProps.length; i++) {
         ele.style[cssProps[i]] = styles[cssProps[i]];
       }
     }
diff --git a/src/components/slides/swiper/swiper-zoom.ts b/src/components/slides/swiper/swiper-zoom.ts
index 3c3936d0553..51c4c39b0f7 100644
--- a/src/components/slides/swiper/swiper-zoom.ts
+++ b/src/components/slides/swiper/swiper-zoom.ts
@@ -1,6 +1,6 @@
 import { Slides } from '../slides';
 import { Platform } from '../../../platform/platform';
-import { transition, transform, isHorizontal, offset, CLS } from './swiper-utils';
+import { CLS, isHorizontal, offset, transform, transition } from './swiper-utils';
 import { getTranslate } from './swiper-transition';
 import { SlideElement } from './swiper-interfaces';
 
@@ -69,7 +69,7 @@ function getDistanceBetweenTouches(ev: TouchEvent) {
 
 
 // Events
-function onGestureStart(s: Slides, plt: Platform, ev: TouchEvent) {
+function onGestureStart(s: Slides, _plt: Platform, ev: TouchEvent) {
   const z = s._zoom;
   s.originalEvent = ev;
 
@@ -105,7 +105,7 @@ function onGestureStart(s: Slides, plt: Platform, ev: TouchEvent) {
 }
 
 
-function onGestureChange(s: Slides, plt: Platform, ev: TouchEvent) {
+function onGestureChange(s: Slides, _plt: Platform, ev: TouchEvent) {
   const z = s._zoom;
   s.originalEvent = ev;
 
@@ -137,7 +137,7 @@ function onGestureChange(s: Slides, plt: Platform, ev: TouchEvent) {
 }
 
 
-function onGestureEnd(s: Slides, plt: Platform, ev: TouchEvent) {
+function onGestureEnd(s: Slides, _plt: Platform, ev: TouchEvent) {
   const z = s._zoom;
   s.originalEvent = ev;
 
@@ -481,7 +481,7 @@ export function resetZoomEvents(s: Slides, plt: Platform) {
     }
 
   } else if (s._touchEvents.start === 'touchstart') {
-    for (var i = 0; i < slides.length; i++) {
+    for (let i = 0; i < slides.length; i++) {
       slide = slides[i];
       // touchstart
       plt.registerListener(slide, s._touchEvents.start, (ev: TouchEvent) => {
@@ -506,7 +506,7 @@ export function resetZoomEvents(s: Slides, plt: Platform) {
   });
   unRegs.push(() => { touchStartSub.unsubscribe(); });
 
-  for (var i = 0; i < slides.length; i++) {
+  for (let i = 0; i < slides.length; i++) {
     slide = slides[i];
     if (slide.querySelector('.' + CLS.zoomContainer)) {
       plt.registerListener(slide, 's.touchEvents.move', (ev: TouchEvent) => {
diff --git a/src/components/slides/swiper/swiper.ts b/src/components/slides/swiper/swiper.ts
index bc8c7beae9b..0f8ca1484b5 100644
--- a/src/components/slides/swiper/swiper.ts
+++ b/src/components/slides/swiper/swiper.ts
@@ -14,9 +14,9 @@
 
 import { SlideElement } from './swiper-interfaces';
 import { Platform } from '../../../platform/platform';
-import { maxTranslate, minTranslate, addClass, eachChild, inlineStyle, removeClass, isHorizontal, round, updateSlidesOffset, CLS } from './swiper-utils';
+import { CLS, addClass, eachChild, inlineStyle, isHorizontal, maxTranslate, minTranslate, removeClass, round, updateSlidesOffset } from './swiper-utils';
 import { Slides } from '../slides';
-import { setWrapperTranslate, setWrapperTransition } from './swiper-transition';
+import { setWrapperTransition, setWrapperTranslate } from './swiper-transition';
 import { updateProgress } from './swiper-progress';
 import { updateClasses } from './swiper-classes';
 import { parallaxSetTranslate } from './swiper-parallax';
@@ -926,7 +926,7 @@ function cleanupStyles(s: Slides) {
   // Buttons
   removeClass(s.prevButton, CLS.buttonDisabled);
   removeClass(s.nextButton, CLS.buttonDisabled);
-};
+}
 
 
 // Destroy
diff --git a/src/components/slides/test/basic/app.module.ts b/src/components/slides/test/basic/app.module.ts
index c480b5430e3..26d07b21f36 100644
--- a/src/components/slides/test/basic/app.module.ts
+++ b/src/components/slides/test/basic/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, NgModule } from '@angular/core';
+import { Component, NgModule, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, Slides } from '../../../..';
 
diff --git a/src/components/slides/test/control/app.module.ts b/src/components/slides/test/control/app.module.ts
index fa91ab3f66a..2317f74401a 100644
--- a/src/components/slides/test/control/app.module.ts
+++ b/src/components/slides/test/control/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, NgModule } from '@angular/core';
+import { Component, NgModule, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, Slides } from '../../../..';
 
diff --git a/src/components/slides/test/controller/app.module.ts b/src/components/slides/test/controller/app.module.ts
index 85963772a0e..1d102ff16e6 100644
--- a/src/components/slides/test/controller/app.module.ts
+++ b/src/components/slides/test/controller/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, NgModule } from '@angular/core';
+import { Component, NgModule, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, Slides } from '../../../..';
 
diff --git a/src/components/slides/test/images/app.module.ts b/src/components/slides/test/images/app.module.ts
index eb0a88b16e0..a045491444b 100644
--- a/src/components/slides/test/images/app.module.ts
+++ b/src/components/slides/test/images/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, NgModule } from '@angular/core';
+import { Component, NgModule, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { Http } from '@angular/http';
 
diff --git a/src/components/slides/test/loop/app.module.ts b/src/components/slides/test/loop/app.module.ts
index d1ce12c3984..90071847cfa 100644
--- a/src/components/slides/test/loop/app.module.ts
+++ b/src/components/slides/test/loop/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, NgModule } from '@angular/core';
+import { Component, NgModule, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, Slides } from '../../../..';
 
diff --git a/src/components/slides/test/options/app.module.ts b/src/components/slides/test/options/app.module.ts
index bbd9268d354..a59a30aff30 100644
--- a/src/components/slides/test/options/app.module.ts
+++ b/src/components/slides/test/options/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, NgModule } from '@angular/core';
+import { Component, NgModule, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, Slides } from '../../../..';
 
diff --git a/src/components/slides/test/rtl/app.module.ts b/src/components/slides/test/rtl/app.module.ts
index 304f00b2bb4..c480d67c76b 100644
--- a/src/components/slides/test/rtl/app.module.ts
+++ b/src/components/slides/test/rtl/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, NgModule } from '@angular/core';
+import { Component, NgModule, ViewChild } from '@angular/core';
 import { IonicApp, IonicModule, Slides } from  '../../../..';
 
 
diff --git a/src/components/snapshot/test/basic/pages/components/components.module.ts b/src/components/snapshot/test/basic/pages/components/components.module.ts
index c55f6d8c3e1..acf873adb7c 100644
--- a/src/components/snapshot/test/basic/pages/components/components.module.ts
+++ b/src/components/snapshot/test/basic/pages/components/components.module.ts
@@ -126,7 +126,7 @@ import {AppModule as NavChildNavs} from '../../../../../nav/test/child-navs/app/
 import {AppModule as NavInitAsync} from '../../../../../nav/test/init-async/app.module';
 import {AppModule as NavInsertViews} from '../../../../../nav/test/insert-views/app.module';
 import {AppModule as NavMemory} from '../../../../../nav/test/memory/app.module';
-import {AppModule as NavNavPushPop} from '../../../../../nav/test/nav-push-pop/app.module';
+import {AppModule as NavNavPushPop} from '../../../../../nav/test/nav-push-pop/app/app.module';
 import {AppModule as NavWorstCase} from '../../../../../nav/test/worst-case/app.module';
 
 import {AppModule as PickerBasic} from '../../../../../picker/test/basic/app/app.module';
diff --git a/src/components/snapshot/test/basic/pages/components/components.ts b/src/components/snapshot/test/basic/pages/components/components.ts
index 750882d6342..b7b630c4681 100644
--- a/src/components/snapshot/test/basic/pages/components/components.ts
+++ b/src/components/snapshot/test/basic/pages/components/components.ts
@@ -127,7 +127,7 @@ import { AppComponent as NavChildNavs } from '../../../../../nav/test/child-navs
 import { AppComponent as NavInitAsync } from '../../../../../nav/test/init-async/app.module';
 import { AppComponent as NavInsertViews } from '../../../../../nav/test/insert-views/app.module';
 import { AppComponent as NavMemory } from '../../../../../nav/test/memory/app.module';
-import { AppComponent as NavNavPushPop } from '../../../../../nav/test/nav-push-pop/app.module';
+import { AppComponent as NavNavPushPop } from '../../../../../nav/test/nav-push-pop/app/app.component';
 import { AppComponent as NavWorstCase } from '../../../../../nav/test/worst-case/app.module';
 
 import { AppComponent as PickerBasic } from '../../../../../picker/test/basic/app/app.component';
@@ -560,7 +560,7 @@ export class ComponentsPage {
     }
   ];
 
-  constructor(private navCtrl: NavController, private assistive: AssistiveTouchProvider) {
+  constructor(private navCtrl: NavController, assistive: AssistiveTouchProvider) {
     assistive.closeButton.subscribe(this.close.bind(this));
   }
 
diff --git a/src/components/spinner/spinner.ts b/src/components/spinner/spinner.ts
index d43b42a9a8e..b60a5e44e13 100644
--- a/src/components/spinner/spinner.ts
+++ b/src/components/spinner/spinner.ts
@@ -181,12 +181,12 @@ export class Spinner extends Ion {
       const spinner = SPINNERS[name];
       if (spinner) {
         if (spinner.lines) {
-          for (var i = 0, l = spinner.lines; i < l; i++) {
+          for (let i = 0, l = spinner.lines; i < l; i++) {
             this._l.push(this._loadEle(spinner, i, l));
           }
 
         } else if (spinner.circles) {
-          for (var i = 0, l = spinner.circles; i < l; i++) {
+          for (let i = 0, l = spinner.circles; i < l; i++) {
             this._c.push(this._loadEle(spinner, i, l));
           }
         }
@@ -294,7 +294,7 @@ const SPINNERS: any = {
   dots: {
     dur: 750,
     circles: 3,
-    fn: function (dur: number, index: number) {
+    fn: function (_dur: number, index: number) {
       const animationDelay = -(110 * index) + 'ms';
       return {
         r: 6,
diff --git a/src/components/split-pane/split-pane.ts b/src/components/split-pane/split-pane.ts
index e9e43188aae..0ce42933f07 100644
--- a/src/components/split-pane/split-pane.ts
+++ b/src/components/split-pane/split-pane.ts
@@ -1,6 +1,6 @@
-import { ContentChildren, Directive, ElementRef, EventEmitter, forwardRef, Input, Output, QueryList, NgZone, Renderer } from '@angular/core';
+import { ContentChildren, Directive, ElementRef, EventEmitter, Input, NgZone, Output, QueryList, Renderer, forwardRef } from '@angular/core';
 import { Ion } from '../ion';
-import { isTrueProperty, assert } from '../../util/util';
+import { assert, isTrueProperty } from '../../util/util';
 import { Config } from '../../config/config';
 import { Platform } from '../../platform/platform';
 
diff --git a/src/components/tabs/tab-highlight.ts b/src/components/tabs/tab-highlight.ts
index 845d79968ef..0f7a8d09ff4 100644
--- a/src/components/tabs/tab-highlight.ts
+++ b/src/components/tabs/tab-highlight.ts
@@ -15,10 +15,13 @@ export class TabHighlight {
   constructor(private _elementRef: ElementRef, private _dom: DomController) {}
 
   select(tab: Tab) {
+    if (!tab) {
+      return;
+    }
     const dom = this._dom;
 
     dom.read(() => {
-      const btnEle: HTMLElement = tab.btn.getElementRef().nativeElement;
+      const btnEle: HTMLElement = tab.btn.getNativeElement();
       const transform = `translate3d(${btnEle.offsetLeft}px,0,0) scaleX(${btnEle.offsetWidth})`;
 
       dom.write(() => {
diff --git a/src/components/tabs/tab.ts b/src/components/tabs/tab.ts
index 416e7f49bff..d68fc6e1c68 100644
--- a/src/components/tabs/tab.ts
+++ b/src/components/tabs/tab.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, ComponentFactoryResolver, ComponentRef, ElementRef, ErrorHandler, EventEmitter, Input, NgZone, Optional, Output, Renderer, ViewChild, ViewEncapsulation, ViewContainerRef } from '@angular/core';
+import { ChangeDetectorRef, Component, ComponentFactoryResolver, ComponentRef, ElementRef, ErrorHandler, EventEmitter, Input, NgZone, Optional, Output, Renderer, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core';
 
 import { App } from '../app/app';
 import { Config } from '../../config/config';
@@ -6,7 +6,6 @@ import { DeepLinker } from '../../navigation/deep-linker';
 import { DomController } from '../../platform/dom-controller';
 import { GestureController } from '../../gestures/gesture-controller';
 import { isTrueProperty } from '../../util/util';
-import { Keyboard } from '../../platform/keyboard';
 import { Tab as ITab } from '../../navigation/nav-interfaces';
 import { NavControllerBase } from '../../navigation/nav-controller-base';
 import { NavOptions } from '../../navigation/nav-util';
@@ -174,6 +173,16 @@ export class Tab extends NavControllerBase implements ITab {
    */
   _tabsHideOnSubPages: boolean;
 
+  /**
+   * @hidden
+   */
+  _lazyRootFromUrl: any;
+
+  /**
+   * @hidden
+   */
+  _lazyRootFromUrlData: any;
+
   /**
    * @input {Page} Set the root page for this tab.
    */
@@ -250,12 +259,13 @@ export class Tab extends NavControllerBase implements ITab {
    */
   @Output() ionSelect: EventEmitter<Tab> = new EventEmitter<Tab>();
 
+
+
   constructor(
     parent: Tabs,
     app: App,
     config: Config,
     plt: Platform,
-    keyboard: Keyboard,
     elementRef: ElementRef,
     zone: NgZone,
     renderer: Renderer,
@@ -268,7 +278,7 @@ export class Tab extends NavControllerBase implements ITab {
     errHandler: ErrorHandler
   ) {
     // A Tab is a NavController for its child pages
-    super(parent, app, config, plt, keyboard, elementRef, zone, renderer, cfr, gestureCtrl, transCtrl, linker, _dom, errHandler);
+    super(parent, app, config, plt, elementRef, zone, renderer, cfr, gestureCtrl, transCtrl, linker, _dom, errHandler);
 
     this.id = parent.add(this);
     this._tabsHideOnSubPages = config.getBoolean('tabsHideOnSubPages');
@@ -295,9 +305,35 @@ export class Tab extends NavControllerBase implements ITab {
    * @hidden
    */
   load(opts: NavOptions, done?: () => void) {
-    if (!this._loaded && this.root) {
+    if (this._lazyRootFromUrl || (!this._loaded && this.root)) {
       this.setElementClass('show-tab', true);
-      this.push(this.root, this.rootParams, opts, done);
+      // okay, first thing we need to do if check if the view already exists
+      const nameToUse = this._lazyRootFromUrl ? this._lazyRootFromUrl : this.root;
+      const dataToUse = this._lazyRootFromUrlData ? this._lazyRootFromUrlData : this.rootParams;
+      const numViews = this.length() - 1;
+      for (let i = numViews; i >= 0; i--) {
+        const viewController = this.getByIndex(i);
+        if (viewController && (viewController.id === nameToUse || viewController.component === nameToUse)) {
+          if (i === numViews) {
+            // this is the last view in the stack and it's the same
+            // as the segment so there's no change needed
+            return done();
+          } else {
+            // it's not the exact view as the end
+            // let's have this nav go back to this exact view
+            return this.popTo(viewController, {
+              animate: false,
+              updateUrl: false,
+            }, done);
+          }
+        }
+      }
+
+      this.push(nameToUse, dataToUse, opts, done);
+
+
+      this._lazyRootFromUrl = null;
+      this._lazyRootFromUrlData = null;
       this._loaded = true;
 
     } else {
@@ -307,7 +343,7 @@ export class Tab extends NavControllerBase implements ITab {
       this._dom.read(() => {
         this.resize();
       });
-      done();
+      return done();
     }
   }
 
@@ -375,7 +411,7 @@ export class Tab extends NavControllerBase implements ITab {
    */
   updateHref(component: any, data: any) {
     if (this.btn && this.linker) {
-      let href = this.linker.createUrl(this, component, data) || '#';
+      let href = this.linker.createUrl(this.parent, component, data) || '#';
       this.btn.updateHref(href);
     }
   }
@@ -387,4 +423,14 @@ export class Tab extends NavControllerBase implements ITab {
     this.destroy();
   }
 
+  /**
+   * @hidden
+   */
+  getType() {
+    return 'tab';
+  }
+
+  goToRoot(opts: NavOptions) {
+    return this.setRoot(this.root, this.rootParams, opts, null);
+  }
 }
diff --git a/src/components/tabs/tabs.md.scss b/src/components/tabs/tabs.md.scss
index 8bc47721785..acb7af6caaf 100644
--- a/src/components/tabs/tabs.md.scss
+++ b/src/components/tabs/tabs.md.scss
@@ -302,7 +302,7 @@ $tabs-md-tab-icon-size:                       2.4rem !default;
   transition-duration: 300ms;
 }
 
-.tabs-md[tabsHighlight=true][tabsPlacement=bottom] .tab-highlight {
+.tabs-md[tabsHighlight=true][tabsPlacement=bottom] > .tabbar > .tab-highlight {
   top: 0;
 }
 
diff --git a/src/components/tabs/tabs.scss b/src/components/tabs/tabs.scss
index 32923b0d094..c07cb681daf 100644
--- a/src/components/tabs/tabs.scss
+++ b/src/components/tabs/tabs.scss
@@ -17,6 +17,10 @@
   opacity: 0;
 }
 
+.tabbar-hidden .tabbar {
+  display: none;
+}
+
 .tabbar.show-tabbar {
   opacity: 1;
 }
diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts
index 1b53efeb19a..302432d1e62 100644
--- a/src/components/tabs/tabs.ts
+++ b/src/components/tabs/tabs.ts
@@ -1,14 +1,20 @@
-import { AfterViewInit, Component, ElementRef, EventEmitter, forwardRef, Input, Output, Optional, Renderer, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, EventEmitter, Input, Optional, Output, Renderer, ViewChild, ViewContainerRef, ViewEncapsulation, forwardRef } from '@angular/core';
+
+import { Subject } from 'rxjs/Subject';
+import 'rxjs/add/operator/takeUntil';
 
 import { App } from '../app/app';
 import { Config } from '../../config/config';
 import { DeepLinker } from '../../navigation/deep-linker';
 import { Ion } from '../ion';
-import { isBlank, assert } from '../../util/util';
+import { assert, isBlank, isPresent } from '../../util/util';
+import { Keyboard } from '../../platform/keyboard';
 import { Tabs as ITabs } from '../../navigation/nav-interfaces';
 import { NavController } from '../../navigation/nav-controller';
 import { NavControllerBase } from '../../navigation/nav-controller-base';
-import { getComponent, NavOptions, DIRECTION_SWITCH } from '../../navigation/nav-util';
+import { NavigationContainer } from '../../navigation/navigation-container';
+import { DIRECTION_SWITCH, NavOptions, getComponent } from '../../navigation/nav-util';
+import { formatUrlPart } from '../../navigation/url-serializer';
 import { RootNode } from '../split-pane/split-pane';
 import { Platform } from '../../platform/platform';
 import { Tab } from './tab';
@@ -160,7 +166,7 @@ import { ViewController } from '../../navigation/view-controller';
   encapsulation: ViewEncapsulation.None,
   providers: [{provide: RootNode, useExisting: forwardRef(() => Tabs) }]
 })
-export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
+export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs, NavigationContainer {
   /** @internal */
   _ids: number = -1;
   /** @internal */
@@ -176,7 +182,13 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
   /** @internal */
   _selectHistory: string[] = [];
   /** @internal */
-  _resizeObs: any;
+  _onDestroy = new Subject<void>();
+
+
+  /**
+   * @input {string} A unique name for the tabs
+   */
+  @Input() name: string;
 
   /**
    * @input {number} The default selected tab index when first loaded. If a selected index isn't provided then it will use `0`, the first tab.
@@ -231,7 +243,8 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
     elementRef: ElementRef,
     private _plt: Platform,
     renderer: Renderer,
-    private _linker: DeepLinker
+    private _linker: DeepLinker,
+    keyboard?: Keyboard
   ) {
     super(config, elementRef, renderer, 'tabs');
 
@@ -251,7 +264,7 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
 
     } else if (this._app) {
       // this is the root navcontroller for the entire app
-      this._app._setRootNav(this);
+      this._app.registerRootNav(this);
     }
 
     // Tabs may also be an actual ViewController which was navigated to
@@ -261,10 +274,33 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
       viewCtrl._setContent(this);
       viewCtrl._setContentRef(elementRef);
     }
+
+    const keyboardResizes = config.getBoolean('keyboardResizes', false);
+    if (keyboard && keyboardResizes) {
+      keyboard.willHide
+        .takeUntil(this._onDestroy)
+        .subscribe(() => {
+          this._plt.timeout(() => this.setTabbarHidden(false), 50);
+        });
+      keyboard.willShow
+        .takeUntil(this._onDestroy)
+        .subscribe(() => this.setTabbarHidden(true));
+    }
+  }
+
+  /**
+   * @internal
+   */
+  setTabbarHidden(tabbarHidden: boolean) {
+    this.setElementClass('tabbar-hidden', tabbarHidden);
+    this.resize();
   }
 
+  /**
+   * @internal
+   */
   ngOnDestroy() {
-    this._resizeObs && this._resizeObs.unsubscribe();
+    this._onDestroy.next();
     this.parent.unregisterChildNav(this);
   }
 
@@ -277,9 +313,9 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
     this._setConfig('tabsHighlight', this.tabsHighlight);
 
     if (this.tabsHighlight) {
-      this._resizeObs = this._plt.resize.subscribe(() => {
-        this._highlight.select(this.getSelected());
-      });
+      this._plt.resize
+        .takeUntil(this._onDestroy)
+        .subscribe(() => this._highlight.select(this.getSelected()));
     }
 
     this.initTabs();
@@ -294,10 +330,10 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
     let selectedIndex = (isBlank(this.selectedIndex) ? 0 : parseInt(<any>this.selectedIndex, 10));
 
     // now see if the deep linker can find a tab index
-    const tabsSegment = this._linker.initNav(this);
-    if (tabsSegment && isBlank(tabsSegment.component)) {
+    const tabsSegment = this._linker.getSegmentByNavIdOrName(this.id, this.name);
+    if (tabsSegment) {
       // we found a segment which probably represents which tab to select
-      selectedIndex = this._linker.getSelectedTabIndex(this, tabsSegment.name, selectedIndex);
+      selectedIndex = this._getSelectedTabIndex(tabsSegment.secondaryId, selectedIndex);
     }
 
     // get the selectedIndex and ensure it isn't hidden or disabled
@@ -309,20 +345,11 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
     }
 
     if (selectedTab) {
-      // we found a tab to select
-      // get the segment the deep linker says this tab should load with
-      let pageId: string = null;
       if (tabsSegment) {
-        let selectedTabSegment = this._linker.initNav(selectedTab);
-        if (selectedTabSegment && selectedTabSegment.component) {
-          selectedTab.root = selectedTabSegment.component;
-          selectedTab.rootParams = selectedTabSegment.data;
-          pageId = selectedTabSegment.id;
-        }
+        selectedTab._lazyRootFromUrl = tabsSegment.name;
+        selectedTab._lazyRootFromUrlData = tabsSegment.data;
       }
-      this.select(selectedTab, {
-        id: pageId
-      });
+      this.select(selectedTab);
     }
 
     // set the initial href attribute values for each tab
@@ -353,7 +380,7 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
   /**
    * @param {number|Tab} tabOrIndex Index, or the Tab instance, of the tab to select.
    */
-  select(tabOrIndex: number | Tab, opts: NavOptions = {}) {
+  select(tabOrIndex: number | Tab, opts: NavOptions = {}, fromUrl: boolean = false) {
     const selectedTab: Tab = (typeof tabOrIndex === 'number' ? this.getByIndex(tabOrIndex) : tabOrIndex);
     if (isBlank(selectedTab)) {
       return;
@@ -361,8 +388,8 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
 
     // If the selected tab is the current selected tab, we do not switch
     const currentTab = this.getSelected();
-    if (selectedTab === currentTab) {
-      return this._touchActive(selectedTab);
+    if (selectedTab === currentTab && currentTab.getActive()) {
+      return this._updateCurrentTab(selectedTab, fromUrl);
     }
 
     // If the selected tab does not have a root, we do not switch (#9392)
@@ -475,8 +502,16 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
   /**
    * @internal
    */
-  getActiveChildNav(): Tab {
-    return this.getSelected();
+  getActiveChildNavs(): Tab[] {
+    const selected = this.getSelected();
+    return selected ? [selected] : [];
+  }
+
+  /**
+   * @internal
+   */
+  getAllChildNavs(): any[] {
+    return this._tabs;
   }
 
   /**
@@ -497,11 +532,28 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
    * "Touch" the active tab, going back to the root view of the tab
    * or optionally letting the tab handle the event
    */
-  private _touchActive(tab: Tab) {
+  private _updateCurrentTab(tab: Tab, fromUrl: boolean) {
     const active = tab.getActive();
 
     if (active) {
-      if (active._cmp && active._cmp.instance.ionSelected) {
+      if (fromUrl && tab._lazyRootFromUrl) {
+        // see if the view controller exists
+        const vc = tab.getViewById(tab._lazyRootFromUrl);
+        if (vc) {
+          // the view is already in the stack
+          tab.popTo(vc, {
+            animate: false,
+            updateUrl: false,
+          });
+        } else {
+          tab.setRoot(tab._lazyRootFromUrl, tab._lazyRootFromUrlData, {
+            animate: false, updateUrl: false
+          });
+          tab._lazyRootFromUrl = null;
+          tab._lazyRootFromUrlData = null;
+        }
+
+      } else if (active._cmp && active._cmp.instance.ionSelected) {
         // if they have a custom tab selected handler, call it
         active._cmp.instance.ionSelected();
 
@@ -563,6 +615,50 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs {
     }
   }
 
+  goToRoot(opts: NavOptions) {
+    if (this._tabs.length) {
+      return this.select(this._tabs[0], opts);
+    }
+  }
+
+  /*
+   * @private
+   */
+  getType() {
+    return 'tabs';
+  }
+
+  /*
+   * @private
+   */
+  getSecondaryIdentifier(): string {
+    const tabs = this.getActiveChildNavs();
+    if (tabs && tabs.length) {
+      return this._linker._getTabSelector(tabs[0]);
+    }
+    return '';
+  }
+
+  /**
+   * @private
+   */
+  _getSelectedTabIndex(secondaryId: string, fallbackIndex: number = 0): number {
+    // we found a segment which probably represents which tab to select
+    const indexMatch = secondaryId.match(/tab-(\d+)/);
+    if (indexMatch) {
+      // awesome, the segment name was something "tab-0", and
+      // the numbe represents which tab to select
+      return parseInt(indexMatch[1], 10);
+    }
+
+    // wasn't in the "tab-0" format so maybe it's using a word
+    const tab = this._tabs.find(t => {
+      return (isPresent(t.tabUrlPath) && t.tabUrlPath === secondaryId) ||
+             (isPresent(t.tabTitle) && formatUrlPart(t.tabTitle) === secondaryId);
+    });
+
+    return isPresent(tab) ? tab.index : fallbackIndex;
+  }
 }
 
 let tabIds = -1;
diff --git a/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.html b/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.html
index 3897ae9f878..251ee98104c 100644
--- a/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.html
+++ b/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.html
@@ -16,6 +16,7 @@
   <p><button ion-button (click)="color = !color" [color]="color ? 'primary':'secondary'">Change color</button></p>
   <p>"Change color" should continue working after clicking Logout in the tabbar and cancelling (No in the alert)</p>
   <p>UserId: {{userId}}</p>
+  <p><ion-input></ion-input></p>
   <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
   <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
 
diff --git a/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.ts b/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.ts
index c7623374813..4cf275ffe63 100644
--- a/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.ts
+++ b/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.ts
@@ -28,7 +28,7 @@ export class Tab1Page1 {
   }
 
   logout() {
-    this.app.getRootNav().setRoot('sign-in', null, { animate: true, direction: 'back' });
+    // this.app.getRootNavById().setRoot('sign-in', null, { animate: true, direction: 'back' });
   }
 
   ionViewWillEnter() {
diff --git a/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts b/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts
index df84b044abd..85af94da2b4 100644
--- a/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts
+++ b/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild } from '@angular/core';
-import { AlertController, IonicPage, NavController, NavParams, ModalController, Tabs, Tab } from '../../../../../..';
+import { AlertController, IonicPage, ModalController, NavController, NavParams, Tab, Tabs } from '../../../../../..';
 
 @IonicPage({
   name: 'tabs-page'
diff --git a/src/components/tabs/test/basic/pages/tab-three/tab-three.ts b/src/components/tabs/test/basic/pages/tab-three/tab-three.ts
index a2ea8659c98..77e0f024542 100644
--- a/src/components/tabs/test/basic/pages/tab-three/tab-three.ts
+++ b/src/components/tabs/test/basic/pages/tab-three/tab-three.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { App, AlertController, IonicPage, ModalController, Tabs } from '../../../../../..';
+import { AlertController, App, IonicPage, ModalController, Tabs } from '../../../../../..';
 
 @IonicPage()
 @Component({
diff --git a/src/components/tabs/test/events/app.module.ts b/src/components/tabs/test/events/app.module.ts
index 3fdfe6106ef..19ddb184f56 100644
--- a/src/components/tabs/test/events/app.module.ts
+++ b/src/components/tabs/test/events/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, Events } from '../../../..';
+import { Events, IonicApp, IonicModule } from '../../../..';
 
 //
 // Tab 1
diff --git a/src/components/tabs/test/ghost/app.module.ts b/src/components/tabs/test/ghost/app.module.ts
index 115009b8452..d694520e3db 100644
--- a/src/components/tabs/test/ghost/app.module.ts
+++ b/src/components/tabs/test/ghost/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, QueryList, ViewChildren, NgModule } from '@angular/core';
+import { Component, NgModule, QueryList, ViewChildren } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, Tab } from '../../../..';
 
diff --git a/src/components/tabs/test/lifecyles/app.module.ts b/src/components/tabs/test/lifecyles/app.module.ts
index 734498c4d3d..7b308cf8964 100644
--- a/src/components/tabs/test/lifecyles/app.module.ts
+++ b/src/components/tabs/test/lifecyles/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, NavController, AlertController } from '../../../..';
+import { AlertController, IonicApp, IonicModule, NavController } from '../../../..';
 
 //
 // Tab 1
diff --git a/src/components/tabs/test/tab.spec.ts b/src/components/tabs/test/tab.spec.ts
new file mode 100644
index 00000000000..0c95bd20437
--- /dev/null
+++ b/src/components/tabs/test/tab.spec.ts
@@ -0,0 +1,91 @@
+import { mockTab, mockTabs, mockView, mockViews } from '../../../util/mock-providers';
+
+describe('tab', () => {
+  describe('load', () => {
+    it('should measure and refresh the tabs', () => {
+      // TODO - this test is super leaky but I cant come up with a better way short term
+      const tabs = mockTabs();
+      const tab = mockTab(tabs, false);
+      const spy = jasmine.createSpy('done');
+
+      spyOn(tab, 'push');
+      spyOn(tab, 'popTo');
+      tab.load({}, spy);
+
+      expect(tab.push).not.toHaveBeenCalled();
+      expect(tab.popTo).not.toHaveBeenCalled();
+      expect(spy).toHaveBeenCalled();
+    });
+
+    it('should reuse the view if its the top view in the stack', () => {
+      const tabs = mockTabs();
+      const tab = mockTab(tabs, false);
+      const spy = jasmine.createSpy('done');
+
+      const mockViewOne = mockView('one');
+      const mockViewTwo = mockView('two');
+      mockViews(tab, [mockViewOne, mockViewTwo]);
+
+      tab._lazyRootFromUrl = 'someValue';
+      tab._lazyRootFromUrlData = { };
+
+      mockViewTwo.id = tab._lazyRootFromUrl;
+
+      spyOn(tab, 'push');
+      spyOn(tab, 'popTo');
+
+      tab.load({}, spy);
+
+      expect(tab.push).not.toHaveBeenCalled();
+      expect(tab.popTo).not.toHaveBeenCalled();
+      expect(spy).toHaveBeenCalled();
+    });
+
+    it('should pop back to a previous view if ', () => {
+      const tabs = mockTabs();
+      const tab = mockTab(tabs, false);
+      const spy = jasmine.createSpy('done');
+
+      const mockViewOne = mockView('one');
+      const mockViewTwo = mockView('two');
+      mockViews(tab, [mockViewOne, mockViewTwo]);
+
+      tab._lazyRootFromUrl = 'someValue';
+      tab._lazyRootFromUrlData = { };
+
+      mockViewOne.id = tab._lazyRootFromUrl;
+
+      spyOn(tab, 'push');
+      spyOn(tab, 'popTo');
+
+      tab.load({}, spy);
+
+      expect(tab.push).not.toHaveBeenCalled();
+      expect(tab.popTo).toHaveBeenCalled();
+      expect(spy).not.toHaveBeenCalled();
+    });
+
+    it('should push the view if it doesnt exist already', () => {
+      const tabs = mockTabs();
+      const tab = mockTab(tabs, false);
+      const spy = jasmine.createSpy('done');
+
+      const mockViewOne = mockView('one');
+      const mockViewTwo = mockView('two');
+      mockViews(tab, [mockViewOne, mockViewTwo]);
+
+      tab._lazyRootFromUrl = 'someValue';
+      tab._lazyRootFromUrlData = { };
+
+      spyOn(tab, 'push');
+      spyOn(tab, 'popTo');
+
+      tab.load({}, spy);
+
+      expect(tab.push).toHaveBeenCalled();
+      expect(tab.popTo).not.toHaveBeenCalled();
+      expect(spy).not.toHaveBeenCalled();
+    });
+
+  });
+});
diff --git a/src/components/tabs/test/tabs.spec.ts b/src/components/tabs/test/tabs.spec.ts
index a26adbce4ad..d65599128cc 100644
--- a/src/components/tabs/test/tabs.spec.ts
+++ b/src/components/tabs/test/tabs.spec.ts
@@ -170,6 +170,58 @@ describe('Tabs', () => {
 
   });
 
+  describe('getSelectedTabIndex', () => {
+
+    it('should select index from tab title', () => {
+      let tabs = mockTabs();
+      let tab1 = mockTab(tabs);
+      let tab2 = mockTab(tabs);
+      let tab3 = mockTab(tabs);
+
+      tab1.tabTitle = 'My Account';
+      tab2.tabTitle = 'My Contact';
+      tab3.tabTitle = 'My Settings!!';
+
+      let selectedIndex = tabs._getSelectedTabIndex('my-settings');
+      expect(selectedIndex).toEqual(2);
+    });
+
+    it('should select index from tab url path', () => {
+      let tabs = mockTabs();
+      let tab1 = mockTab(tabs);
+      let tab2 = mockTab(tabs);
+      let tab3 = mockTab(tabs);
+
+      tab1.tabUrlPath = 'account';
+      tab2.tabUrlPath = 'contact';
+      tab3.tabUrlPath = 'settings';
+
+      let selectedIndex = tabs._getSelectedTabIndex('settings');
+      expect(selectedIndex).toEqual(2);
+    });
+
+    it('should select index 2 from tab-2 format', () => {
+      let tabs = mockTabs();
+      mockTab(tabs);
+      mockTab(tabs);
+      mockTab(tabs);
+
+      let selectedIndex = tabs._getSelectedTabIndex('tab-2');
+      expect(selectedIndex).toEqual(2);
+    });
+
+    it('should select index 0 when not found', () => {
+      let tabs = mockTabs();
+      mockTab(tabs);
+      mockTab(tabs);
+      mockTab(tabs);
+
+      let selectedIndex = tabs._getSelectedTabIndex('notfound');
+      expect(selectedIndex).toEqual(0);
+    });
+
+  });
+
   describe('getSelected', () => {
 
     it('should get the selected tab', () => {
diff --git a/src/components/toast/test/basic/pages/page-one/page-one.ts b/src/components/toast/test/basic/pages/page-one/page-one.ts
index 914749b42bc..3b430e66eca 100644
--- a/src/components/toast/test/basic/pages/page-one/page-one.ts
+++ b/src/components/toast/test/basic/pages/page-one/page-one.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { IonicPage, NavController, Toast, ToastController } from '../../../../../..';
+import { IonicPage, NavController, ToastController } from '../../../../../..';
 
 @IonicPage()
 @Component({
@@ -72,7 +72,7 @@ export class PageOne {
     }, 1000);
   }
 
-  private dismissHandler(toast: Toast) {
+  private dismissHandler() {
     console.info('Toast onDidDismiss()');
   }
 
diff --git a/src/components/toast/toast-controller.ts b/src/components/toast/toast-controller.ts
index ef4ae3dbe33..f482cbcae15 100644
--- a/src/components/toast/toast-controller.ts
+++ b/src/components/toast/toast-controller.ts
@@ -37,6 +37,8 @@ import { ToastOptions } from './toast-options';
  *
  * @usage
  * ```ts
+ * import { ToastController } from 'ionic-angular';
+ *
  * constructor(private toastCtrl: ToastController) {
  *
  * }
diff --git a/src/components/toast/toast.ts b/src/components/toast/toast.ts
index f51b8409720..7f9da92c45d 100644
--- a/src/components/toast/toast.ts
+++ b/src/components/toast/toast.ts
@@ -5,7 +5,7 @@ import { NavOptions } from '../../navigation/nav-util';
 import { PORTAL_TOAST } from '../app/app-constants';
 import { ToastCmp } from './toast-component';
 import { ToastOptions } from './toast-options';
-import { ToastSlideIn, ToastSlideOut, ToastMdSlideIn, ToastMdSlideOut, ToastWpPopOut, ToastWpPopIn } from './toast-transitions';
+import { ToastMdSlideIn, ToastMdSlideOut, ToastSlideIn, ToastSlideOut, ToastWpPopIn, ToastWpPopOut } from './toast-transitions';
 import { ViewController } from '../../navigation/view-controller';
 
 
@@ -98,6 +98,7 @@ export class Toast extends ViewController {
    */
   present(navOptions: NavOptions = {}): Promise<any> {
     navOptions.disableApp = false;
+    navOptions.keyboardClose = false;
     return this._app.present(this, navOptions, PORTAL_TOAST);
   }
 
diff --git a/src/components/toggle/test/toggle.spec.ts b/src/components/toggle/test/toggle.spec.ts
index 7e59bbcd249..f20944db80b 100644
--- a/src/components/toggle/test/toggle.spec.ts
+++ b/src/components/toggle/test/toggle.spec.ts
@@ -1,6 +1,6 @@
 import { Toggle } from '../toggle';
-import { mockConfig, mockPlatform, mockHaptic, mockElementRef, mockGestureController, mockRenderer, mockItem, mockForm, mockZone } from '../../../util/mock-providers';
-import { commonInputTest, BOOLEAN_CORPUS } from '../../../util/input-tester';
+import { mockConfig, mockElementRef, mockForm, mockGestureController, mockHaptic, mockItem, mockPlatform, mockRenderer, mockZone } from '../../../util/mock-providers';
+import { BOOLEAN_CORPUS, commonInputTest } from '../../../util/input-tester';
 
 describe('Toggle', () => {
 
diff --git a/src/components/toggle/toggle-gesture.ts b/src/components/toggle/toggle-gesture.ts
index 3d28d2b4b10..5d74965b5a7 100644
--- a/src/components/toggle/toggle-gesture.ts
+++ b/src/components/toggle/toggle-gesture.ts
@@ -1,4 +1,4 @@
-import { GestureController, GESTURE_PRIORITY_TOGGLE, GESTURE_TOGGLE } from '../../gestures/gesture-controller';
+import { GESTURE_PRIORITY_TOGGLE, GESTURE_TOGGLE, GestureController } from '../../gestures/gesture-controller';
 import { DomController } from '../../platform/dom-controller';
 import { PanGesture } from '../../gestures/pan-gesture';
 import { Platform } from '../../platform/platform';
diff --git a/src/components/toggle/toggle.ts b/src/components/toggle/toggle.ts
index 02d2121637b..d5ff79d1cc3 100644
--- a/src/components/toggle/toggle.ts
+++ b/src/components/toggle/toggle.ts
@@ -1,4 +1,4 @@
-import { AfterContentInit, NgZone, Component, ElementRef, HostListener, Input, OnDestroy, Optional, Renderer, ViewEncapsulation } from '@angular/core';
+import { AfterContentInit, Component, ElementRef, HostListener, Input, NgZone, OnDestroy, Optional, Renderer, ViewEncapsulation } from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
 
 import { Config } from '../../config/config';
@@ -118,7 +118,7 @@ export class Toggle extends BaseInput<boolean> implements IonicTapInput, AfterCo
   /**
    * @hidden
    */
-  _inputCheckHasValue() {}
+  _inputUpdated() {}
 
   /**
    * @hidden
@@ -210,13 +210,6 @@ export class Toggle extends BaseInput<boolean> implements IonicTapInput, AfterCo
     }
   }
 
-  /**
-   * @hidden
-   */
-  initFocus() {
-    this._elementRef.nativeElement.querySelector('button').focus();
-  }
-
   /**
    * @hidden
    */
diff --git a/src/components/toolbar/toolbar-item.ts b/src/components/toolbar/toolbar-item.ts
index c5aa3c026a5..1825c9036de 100644
--- a/src/components/toolbar/toolbar-item.ts
+++ b/src/components/toolbar/toolbar-item.ts
@@ -1,4 +1,4 @@
-import { ContentChildren, Directive, ElementRef, forwardRef, Optional, Inject, Renderer } from '@angular/core';
+import { ContentChildren, Directive, ElementRef, Inject, Optional, Renderer, forwardRef } from '@angular/core';
 
 import { Button } from '../button/button';
 import { Config } from '../../config/config';
diff --git a/src/components/toolbar/toolbar-title.ts b/src/components/toolbar/toolbar-title.ts
index 38a4e3d2395..e24c9d8e152 100644
--- a/src/components/toolbar/toolbar-title.ts
+++ b/src/components/toolbar/toolbar-title.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, ElementRef, forwardRef, Optional, Inject, Renderer, ViewEncapsulation } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Inject, Optional, Renderer, ViewEncapsulation, forwardRef, } from '@angular/core';
 
 import { Config } from '../../config/config';
 import { Ion } from '../ion';
diff --git a/src/components/virtual-scroll/test/basic/app.module.ts b/src/components/virtual-scroll/test/basic/app.module.ts
index 9faa4cbee5e..13b70cdc7f2 100644
--- a/src/components/virtual-scroll/test/basic/app.module.ts
+++ b/src/components/virtual-scroll/test/basic/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, NavController, Platform } from '../../../..';
+import { IonicApp, IonicModule, NavController } from '../../../..';
 
 
 @Component({
@@ -11,7 +11,7 @@ export class E2EPage {
   webview: string = '';
   counter: number = 0;
 
-  constructor(plt: Platform, public navCtrl: NavController) {}
+  constructor(public navCtrl: NavController) {}
 
   addItems() {
     if (this.items.length === 0) {
@@ -21,7 +21,7 @@ export class E2EPage {
     }
   }
 
-  headerFn(record: any, index: number, records: any[]) {
+  headerFn(_record: any, index: number, _records: any[]) {
     if (index % 4 === 0) {
       return index + ' is divisible by 4';
     }
@@ -59,7 +59,7 @@ export class E2EPage {
     this.items[index] = { value: Math.floor(Math.random() * 10000), someMethod: () => '!!' };
   }
 
-  trackByFn(index: number, item: any) {
+  trackByFn(_index: number, item: any) {
     return item.value;
   }
 
diff --git a/src/components/virtual-scroll/test/cards/app.module.ts b/src/components/virtual-scroll/test/cards/app.module.ts
index ecff4814ef2..14c1a5bb65e 100644
--- a/src/components/virtual-scroll/test/cards/app.module.ts
+++ b/src/components/virtual-scroll/test/cards/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, ViewEncapsulation, NgModule } from '@angular/core';
+import { Component, NgModule, ViewEncapsulation } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../..';
 
diff --git a/src/components/virtual-scroll/test/image-gallery/app.module.ts b/src/components/virtual-scroll/test/image-gallery/app.module.ts
index bc5ce02545a..034a1fe5aa3 100644
--- a/src/components/virtual-scroll/test/image-gallery/app.module.ts
+++ b/src/components/virtual-scroll/test/image-gallery/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, ViewEncapsulation, NgModule } from '@angular/core';
+import { Component, NgModule, ViewEncapsulation } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../..';
 
@@ -37,7 +37,7 @@ export class E2EPage {
     }
   }
 
-  headerFn(record: any, recordIndex: number, records: any[]) {
+  headerFn(record: any) {
     if (this.lastMonth !== record.date.getMonth()) {
       this.lastMonth = record.date.getMonth();
 
@@ -49,7 +49,7 @@ export class E2EPage {
     return null;
   }
 
-  footerFn(record: any, recordIndex: number, records: any[]) {
+  footerFn(_record: any, recordIndex: number, records: any[]) {
 
     if (recordIndex === records.length - 1) {
       return true;
diff --git a/src/components/virtual-scroll/test/sliding-item/app.module.ts b/src/components/virtual-scroll/test/sliding-item/app.module.ts
index bdcdd00fd07..0ed1cabc26d 100644
--- a/src/components/virtual-scroll/test/sliding-item/app.module.ts
+++ b/src/components/virtual-scroll/test/sliding-item/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, ElementRef, NgModule } from '@angular/core';
+import { Component, ElementRef, NgModule, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, Platform } from '../../../..';
 
@@ -32,7 +32,7 @@ export class E2EPage {
     }
   }
 
-  headerFn(record: any, index: number, records: any[]) {
+  headerFn(_record: any, index: number) {
     if (index % 4 === 0) {
       return index + ' is divisible by 4';
     }
diff --git a/src/components/virtual-scroll/test/variable-size/app.module.ts b/src/components/virtual-scroll/test/variable-size/app.module.ts
index 49eaf4272db..1bedcff2e53 100644
--- a/src/components/virtual-scroll/test/variable-size/app.module.ts
+++ b/src/components/virtual-scroll/test/variable-size/app.module.ts
@@ -22,7 +22,7 @@ export class E2EPage {
     }
   }
 
-  headerFn(record: any, recordIndex: number) {
+  headerFn(_record: any, recordIndex: number) {
     if (recordIndex > 0 && recordIndex % 100 === 0) {
       return recordIndex;
     }
diff --git a/src/components/virtual-scroll/test/virtual-scroll.spec.ts b/src/components/virtual-scroll/test/virtual-scroll.spec.ts
index 2d7d3fa1a36..c0b59f40e68 100644
--- a/src/components/virtual-scroll/test/virtual-scroll.spec.ts
+++ b/src/components/virtual-scroll/test/virtual-scroll.spec.ts
@@ -1,5 +1,5 @@
 import { VirtualCell, VirtualData, VirtualNode } from '../virtual-util';
-import { processRecords, populateNodeData, initReadNodes, getVirtualHeight, adjustRendered, estimateHeight } from '../virtual-util';
+import { adjustRendered, estimateHeight, getVirtualHeight, initReadNodes, populateNodeData, processRecords } from '../virtual-util';
 import { mockPlatform } from '../../../util/mock-providers';
 
 
@@ -22,7 +22,7 @@ describe('VirtualScroll', () => {
       ftrWidth: viewportWidth,
       ftrHeight: HEIGHT_FOOTER
     };
-    window.getComputedStyle = function(element) {
+    window.getComputedStyle = function() {
       var styles: any = {
         marginTop: '0px',
         marginRight: '0px',
@@ -229,7 +229,7 @@ describe('VirtualScroll', () => {
       let startCellIndex = 0;
       let endCellIndex = 0;
 
-      populateNodeData(startCellIndex, endCellIndex, data.viewWidth, true,
+      populateNodeData(startCellIndex, endCellIndex, true,
                     cells, records, nodes, viewContainer,
                     itmTmp, hdrTmp, ftrTmp, false);
 
@@ -257,7 +257,7 @@ describe('VirtualScroll', () => {
       let startCellIndex = 2;
       let endCellIndex = 5;
 
-      populateNodeData(startCellIndex, endCellIndex, data.viewWidth, true,
+      populateNodeData(startCellIndex, endCellIndex, true,
                     cells, records, nodes, viewContainer,
                     itmTmp, hdrTmp, ftrTmp, false);
 
@@ -286,7 +286,7 @@ describe('VirtualScroll', () => {
       let startCellIndex = 2;
       let endCellIndex = 4;
 
-      populateNodeData(startCellIndex, endCellIndex, data.viewWidth, true,
+      populateNodeData(startCellIndex, endCellIndex, true,
                        cells, records, nodes, viewContainer,
                        itmTmp, hdrTmp, ftrTmp, true);
 
diff --git a/src/components/virtual-scroll/virtual-scroll.ts b/src/components/virtual-scroll/virtual-scroll.ts
index 88bf65ba80c..6f3d11bfee3 100644
--- a/src/components/virtual-scroll/virtual-scroll.ts
+++ b/src/components/virtual-scroll/virtual-scroll.ts
@@ -1,10 +1,10 @@
 import { AfterContentInit, ChangeDetectorRef, ContentChild, Directive, DoCheck, ElementRef, Input, IterableChanges, IterableDiffer, IterableDiffers, NgZone, OnDestroy, Renderer, TrackByFn } from '@angular/core';
 
-import { adjustRendered, calcDimensions, estimateHeight, initReadNodes, processRecords, populateNodeData, updateDimensions, updateNodeContext, writeToNodes } from './virtual-util';
+import { adjustRendered, calcDimensions, estimateHeight, initReadNodes, populateNodeData, processRecords, updateDimensions, updateNodeContext, writeToNodes } from './virtual-util';
 import { Config } from '../../config/config';
 import { Content, ScrollEvent } from '../content/content';
 import { DomController } from '../../platform/dom-controller';
-import { isFunction, isPresent, assert } from '../../util/util';
+import { assert, isFunction, isPresent } from '../../util/util';
 import { Platform } from '../../platform/platform';
 import { ViewController } from '../../navigation/view-controller';
 import { VirtualCell, VirtualData, VirtualNode } from './virtual-util';
@@ -556,7 +556,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy {
       this._zone.run(() => {
         populateNodeData(
           data.topCell, data.bottomCell,
-          data.viewWidth, true,
+          true,
           cells, records, nodes,
           this._itmTmp.viewContainer,
           this._itmTmp.templateRef,
@@ -694,7 +694,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy {
 
     var hasChanges = populateNodeData(
       data.topCell, data.bottomCell,
-      data.viewWidth, diff > 0,
+      diff > 0,
       cells, records, nodes,
       this._itmTmp.viewContainer,
       this._itmTmp.templateRef,
diff --git a/src/components/virtual-scroll/virtual-util.ts b/src/components/virtual-scroll/virtual-util.ts
index 391faef745d..9dcd614de37 100644
--- a/src/components/virtual-scroll/virtual-util.ts
+++ b/src/components/virtual-scroll/virtual-util.ts
@@ -1,4 +1,4 @@
-import { ViewContainerRef, TemplateRef, EmbeddedViewRef } from '@angular/core';
+import { EmbeddedViewRef, TemplateRef, ViewContainerRef } from '@angular/core';
 
 import { Platform } from '../../platform/platform';
 
@@ -127,7 +127,7 @@ function addCell(previousCell: VirtualCell, recordIndex: number, tmpl: number, t
 /**
  * NO DOM
  */
-export function populateNodeData(startCellIndex: number, endCellIndex: number, viewportWidth: number, scrollingDown: boolean,
+export function populateNodeData(startCellIndex: number, endCellIndex: number, scrollingDown: boolean,
                                  cells: VirtualCell[], records: any[], nodes: VirtualNode[], viewContainer: ViewContainerRef,
                                  itmTmp: TemplateRef<VirtualContext>, hdrTmp: TemplateRef<VirtualContext>, ftrTmp: TemplateRef<VirtualContext>,
                                  initialLoad: boolean): boolean {
@@ -330,7 +330,7 @@ export function updateDimensions(plt: Platform, nodes: VirtualNode[], cells: Vir
       tmpl: -1
     };
 
-    for (var i = 0; i < totalCells; i++) {
+    for (let i = 0; i < totalCells; i++) {
       cell = cells[i];
 
       if (previousCell.left + previousCell.width + cell.width > data.viewWidth) {
@@ -481,7 +481,7 @@ export function adjustRendered(cells: VirtualCell[], data: VirtualData) {
     data.bottomCell = Math.min(data.bottomViewCell + viewableRenderedPadding, totalCells - 1);
     data.topCell = Math.max(data.bottomCell - 2, 0);
 
-    for (var i = data.bottomCell; i >= 0; i--) {
+    for (let i = data.bottomCell; i >= 0; i--) {
       cell = cells[i];
       if (cell.row !== lastRow) {
         cellsRenderHeight += cell.height;
@@ -497,8 +497,6 @@ export function adjustRendered(cells: VirtualCell[], data: VirtualData) {
       }
     }
   }
-
-  // console.log(`adjustRendered topCell: ${data.topCell}, bottomCell: ${data.bottomCell}, cellsRenderHeight: ${cellsRenderHeight}, data.renderHeight: ${data.renderHeight}`);
 }
 
 
@@ -601,7 +599,7 @@ function calcWidth(viewportWidth: number, approxWidth: string): number {
 /**
  * NO DOM
  */
-function calcHeight(viewportHeight: number, approxHeight: string): number {
+function calcHeight(_viewportHeight: number, approxHeight: string): number {
   if (approxHeight.indexOf('px') > 0) {
     return parseFloat(approxHeight);
   }
diff --git a/src/config/config.ts b/src/config/config.ts
index c3725fc18d4..5adcfaf5115 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -8,7 +8,7 @@ import { OpaqueToken } from '@angular/core';
 * Config allows you to set the modes of your components
 */
 import { Platform } from '../platform/platform';
-import { isObject, isDefined, isFunction, isArray } from '../util/util';
+import { isArray, isDefined, isFunction, isObject } from '../util/util';
 
 /**
  * @name Config
diff --git a/src/gestures/gesture-controller.ts b/src/gestures/gesture-controller.ts
index a569bf66d29..d8fd11ec4fb 100644
--- a/src/gestures/gesture-controller.ts
+++ b/src/gestures/gesture-controller.ts
@@ -1,4 +1,4 @@
-import { forwardRef, Inject, Injectable } from '@angular/core';
+import { Inject, Injectable, forwardRef } from '@angular/core';
 import { App } from '../components/app/app';
 import { assert } from '../util/util';
 
diff --git a/src/gestures/gesture.ts b/src/gestures/gesture.ts
index 761b7fb2804..c8f388bbac4 100644
--- a/src/gestures/gesture.ts
+++ b/src/gestures/gesture.ts
@@ -1,5 +1,5 @@
 import { defaults } from '../util/util';
-import { Hammer, DIRECTION_HORIZONTAL, DIRECTION_VERTICAL } from './hammer';
+import { DIRECTION_HORIZONTAL, DIRECTION_VERTICAL, Hammer } from './hammer';
 
 /**
  * @hidden
diff --git a/src/gestures/hammer.ts b/src/gestures/hammer.ts
index 2e76adf4c8c..3262561b7ad 100644
--- a/src/gestures/hammer.ts
+++ b/src/gestures/hammer.ts
@@ -706,7 +706,7 @@ var MOUSE_WINDOW_EVENTS = 'mousemove mouseup';
  * @constructor
  * @extends Input
  */
-function MouseInput(manager: any, handler: any) {
+function MouseInput(_manager: any, _handler: any) {
     this.evEl = MOUSE_ELEMENT_EVENTS;
     this.evWin = MOUSE_WINDOW_EVENTS;
 
@@ -923,7 +923,7 @@ var TOUCH_TARGET_EVENTS = 'touchstart touchmove touchend touchcancel';
  * @constructor
  * @extends Input
  */
-function TouchInput(manager: any, handler: any): void {
+function TouchInput(_manager: any, _handler: any): void {
     this.evTarget = TOUCH_TARGET_EVENTS;
     this.targetIds = {};
 
@@ -1476,7 +1476,7 @@ Recognizer.prototype = {
      * @param {Object} inputData
      * @returns {Const} STATE
      */
-    process: function(inputData: any) { }, // jshint ignore:line
+    process: function(_inputData: any) { }, // jshint ignore:line
 
     /**
      * return the preferred touch-action
@@ -2008,10 +2008,6 @@ function Hammer(element: any, options: any): any {
     return new (<any>Manager)(element, options);
 }
 
-/**
- * @const {string}
- */
-var VERSION = '2.0.6';
 
 /**
  * default settings
diff --git a/src/gestures/pan-gesture.ts b/src/gestures/pan-gesture.ts
index 272ea283dc3..6446869e39b 100644
--- a/src/gestures/pan-gesture.ts
+++ b/src/gestures/pan-gesture.ts
@@ -1,5 +1,5 @@
 import { assert, defaults } from '../util/util';
-import { DomDebouncer, DomController } from '../platform/dom-controller';
+import { DomController, DomDebouncer } from '../platform/dom-controller';
 import { GestureDelegate } from './gesture-controller';
 import { PanRecognizer } from './recognizers';
 import { Platform } from '../platform/platform';
@@ -168,11 +168,11 @@ export class PanGesture {
   }
 
   // Implemented in a subclass
-  canStart(ev: any): boolean { return true; }
-  onDragStart(ev: any) { }
-  onDragMove(ev: any) { }
-  onDragEnd(ev: any) { }
-  notCaptured(ev: any) { }
+  canStart(_ev: any): boolean { return true; }
+  onDragStart(_ev: any) { }
+  onDragMove(_ev: any) { }
+  onDragEnd(_ev: any) { }
+  notCaptured(_ev: any) { }
 }
 
 
diff --git a/src/gestures/pointer-events.ts b/src/gestures/pointer-events.ts
index cd8806ffa00..974e6e8d6d3 100644
--- a/src/gestures/pointer-events.ts
+++ b/src/gestures/pointer-events.ts
@@ -1,5 +1,5 @@
 import { assert } from '../util/util';
-import { Platform, EventListenerOptions } from '../platform/platform';
+import { EventListenerOptions, Platform } from '../platform/platform';
 
 /**
  * @hidden
diff --git a/src/gestures/slide-gesture.ts b/src/gestures/slide-gesture.ts
index c49701aa788..6a0c7197660 100644
--- a/src/gestures/slide-gesture.ts
+++ b/src/gestures/slide-gesture.ts
@@ -1,5 +1,5 @@
 import { PanGesture } from './pan-gesture';
-import { clamp, assert } from '../util/util';
+import { assert, clamp } from '../util/util';
 import { Platform } from '../platform/platform';
 import { pointerCoord } from '../util/dom';
 
@@ -17,7 +17,7 @@ export class SlideGesture extends PanGesture {
    * Get the min and max for the slide. pageX/pageY.
    * Only called on dragstart.
    */
-  getSlideBoundaries(slide: SlideData, ev: any) {
+  getSlideBoundaries(_slide: SlideData, _ev: any) {
     return {
       min: 0,
       max: this.getNativeElement().offsetWidth
@@ -29,7 +29,7 @@ export class SlideGesture extends PanGesture {
    * For example, an open side menu starts at 100% and a closed
    * sidemenu starts at 0%.
    */
-  getElementStartPos(slide: SlideData, ev: any) {
+  getElementStartPos(_slide: SlideData, _ev: any) {
     return 0;
   }
 
@@ -85,10 +85,10 @@ export class SlideGesture extends PanGesture {
     this.slide = null;
   }
 
-  onSlideBeforeStart(ev?: any): void {}
-  onSlideStart(slide?: SlideData, ev?: any): void {}
-  onSlide(slide?: SlideData, ev?: any): void {}
-  onSlideEnd(slide?: SlideData, ev?: any): void {}
+  onSlideBeforeStart(_ev?: any): void {}
+  onSlideStart(_slide?: SlideData, _ev?: any): void {}
+  onSlide(_slide?: SlideData, _ev?: any): void {}
+  onSlideEnd(_slide?: SlideData, _ev?: any): void {}
 }
 
 /**
diff --git a/src/gestures/ui-event-manager.ts b/src/gestures/ui-event-manager.ts
index a8688d25ea7..a39b288e8f4 100644
--- a/src/gestures/ui-event-manager.ts
+++ b/src/gestures/ui-event-manager.ts
@@ -1,5 +1,5 @@
 import { PointerEvents, PointerEventsConfig } from './pointer-events';
-import { Platform, EventListenerOptions } from '../platform/platform';
+import { EventListenerOptions, Platform } from '../platform/platform';
 
 
 /**
diff --git a/src/index.ts b/src/index.ts
index ee391a24245..fdd97078fd8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -62,8 +62,6 @@ export { NavPop } from './components/nav/nav-pop';
 export { NavPopAnchor } from './components/nav/nav-pop-anchor';
 export { NavPush } from './components/nav/nav-push';
 export { NavPushAnchor } from './components/nav/nav-push-anchor';
-export { NativeInput } from './components/input/native-input';
-export { NextInput } from './components/input/next-input';
 export { Note } from './components/note/note';
 export { Option } from './components/option/option';
 export { Picker } from './components/picker/picker';
diff --git a/src/module.ts b/src/module.ts
index f29fd905236..e9b48d79804 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -2,7 +2,7 @@
  * Import Angular
  */
 import { ANALYZE_FOR_ENTRY_COMPONENTS, APP_INITIALIZER, ComponentFactoryResolver, Inject, Injector, ModuleWithProviders, NgModule, NgZone, Optional } from '@angular/core';
-import { APP_BASE_HREF, Location, LocationStrategy, HashLocationStrategy, PathLocationStrategy, PlatformLocation } from '@angular/common';
+import { APP_BASE_HREF, HashLocationStrategy, Location, LocationStrategy, PathLocationStrategy, PlatformLocation } from '@angular/common';
 import { DOCUMENT, HAMMER_GESTURE_CONFIG } from '@angular/platform-browser';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { CommonModule } from '@angular/common';
@@ -18,7 +18,7 @@ import { DeepLinkConfig } from './navigation/nav-util';
 
 import { App } from './components/app/app';
 import { AppRootToken } from './components/app/app-root';
-import { Config, setupConfig, ConfigToken } from './config/config';
+import { Config, ConfigToken, setupConfig } from './config/config';
 import { DeepLinker, setupDeepLinker } from './navigation/deep-linker';
 import { DomController } from './platform/dom-controller';
 import { Events, setupProvideEvents } from './util/events';
@@ -27,14 +27,14 @@ import { GestureController } from './gestures/gesture-controller';
 import { IonicGestureConfig } from './gestures/gesture-config';
 import { Haptic } from './tap-click/haptic';
 import { Keyboard } from './platform/keyboard';
-import { ModuleLoader, provideModuleLoader, setupPreloading, LAZY_LOADED_TOKEN } from './util/module-loader';
+import { LAZY_LOADED_TOKEN, ModuleLoader, provideModuleLoader, setupPreloading } from './util/module-loader';
 import { NgModuleLoader } from './util/ng-module-loader';
 import { Platform, setupPlatform } from './platform/platform';
 import { PlatformConfigToken, providePlatformConfigs } from './platform/platform-registry';
 import { TapClick, setupTapClick } from './tap-click/tap-click';
 import { registerModeConfigs } from './config/mode-registry';
 import { TransitionController } from './transitions/transition-controller';
-import { UrlSerializer, setupUrlSerializer, DeepLinkConfigToken } from './navigation/url-serializer';
+import { DeepLinkConfigToken, UrlSerializer, setupUrlSerializer } from './navigation/url-serializer';
 
 /**
  * Import Components/Directives/Etc
@@ -69,8 +69,6 @@ import { Icon } from './components/icon/icon';
 import { Img } from './components/img/img';
 import { InfiniteScroll } from './components/infinite-scroll/infinite-scroll';
 import { InfiniteScrollContent } from './components/infinite-scroll/infinite-scroll-content';
-import { NativeInput } from './components/input/native-input';
-import { NextInput } from './components/input/next-input';
 import { TextInput } from './components/input/input';
 import { Item } from './components/item/item';
 import { ItemContent } from './components/item/item-content';
@@ -221,8 +219,6 @@ import { VirtualScroll } from './components/virtual-scroll/virtual-scroll';
     ListHeader,
     Reorder,
     LoadingCmp,
-    NativeInput,
-    NextInput,
     Menu,
     MenuClose,
     MenuToggle,
@@ -324,8 +320,6 @@ import { VirtualScroll } from './components/virtual-scroll/virtual-scroll';
     ListHeader,
     Reorder,
     LoadingCmp,
-    NativeInput,
-    NextInput,
     Menu,
     MenuClose,
     MenuToggle,
@@ -451,7 +445,7 @@ export class IonicModule {
 
         { provide: ModuleLoader, useFactory: provideModuleLoader, deps: [NgModuleLoader, Injector]},
         { provide: LocationStrategy, useFactory: provideLocationStrategy, deps: [ PlatformLocation, [new Inject(APP_BASE_HREF), new Optional()], Config ] },
-        { provide: UrlSerializer, useFactory: setupUrlSerializer, deps: [ DeepLinkConfigToken ] },
+        { provide: UrlSerializer, useFactory: setupUrlSerializer, deps: [ App, DeepLinkConfigToken ] },
         { provide: DeepLinker, useFactory: setupDeepLinker, deps: [ App, UrlSerializer, Location,  ModuleLoader, ComponentFactoryResolver ] },
       ]
     };
diff --git a/src/navigation/deep-linker.ts b/src/navigation/deep-linker.ts
index a4d57d5860a..3c5d06c748e 100644
--- a/src/navigation/deep-linker.ts
+++ b/src/navigation/deep-linker.ts
@@ -2,12 +2,13 @@ import { ComponentFactory, ComponentFactoryResolver } from '@angular/core';
 import { Location } from '@angular/common';
 
 import { App } from '../components/app/app';
-import { convertToViews, DIRECTION_BACK, isNav, isTab, isTabs, NavLink, NavSegment } from './nav-util';
+import { DIRECTION_BACK, NavLink, NavSegment, convertToViews, isNav, isTab, isTabs,  } from './nav-util';
 import { ModuleLoader } from '../util/module-loader';
 import { isArray, isPresent } from '../util/util';
-import { Nav, Tab, Tabs } from './nav-interfaces';
+import { Tab, Tabs } from './nav-interfaces';
+import { NavigationContainer } from './navigation-container';
 import { NavController } from './nav-controller';
-import { UrlSerializer } from './url-serializer';
+import { UrlSerializer, formatUrlPart } from './url-serializer';
 import { ViewController } from './view-controller';
 
 /**
@@ -15,8 +16,6 @@ import { ViewController } from './view-controller';
  */
 export class DeepLinker {
 
-  /** @internal */
-  _segments: NavSegment[] = [];
   /** @internal */
   _history: string[] = [];
   /** @internal */
@@ -39,9 +38,6 @@ export class DeepLinker {
     const browserUrl = normalizeUrl(this._location.path());
     console.debug(`DeepLinker, init load: ${browserUrl}`);
 
-    // update the Path from the browser URL
-    this._segments = this._serializer.parse(browserUrl);
-
     // remember this URL in our internal history stack
     this._historyPush(browserUrl);
 
@@ -58,7 +54,7 @@ export class DeepLinker {
   _urlChange(browserUrl: string) {
     // do nothing if this url is the same as the current one
     if (!this._isCurrentUrl(browserUrl)) {
-
+      let isGoingBack = true;
       if (this._isBackUrl(browserUrl)) {
         // scenario 2: user clicked the browser back button
         // scenario 4: user changed the browser URL to what was the back url was
@@ -70,13 +66,14 @@ export class DeepLinker {
         // scenario 3: user click forward button
         // scenario 4: user changed browser URL that wasn't the back url
         // scenario 5: user clicked a link href that wasn't the back url
+        isGoingBack = false;
         console.debug(`DeepLinker, browser urlChange, forward to: ${browserUrl}`);
         this._historyPush(browserUrl);
       }
 
-      // get the app's root nav
-      const appRootNav = <Nav> (this._app.getRootNav() as any);
-      if (appRootNav) {
+      // get the app's root nav container
+      const activeNavContainers = this._app.getActiveNavContainers();
+      if (activeNavContainers && activeNavContainers.length) {
         if (browserUrl === '/') {
           // a url change to the index url
           if (isPresent(this._indexAliasUrl)) {
@@ -88,40 +85,114 @@ export class DeepLinker {
             // the url change is to the root but we don't
             // already know the url used. So let's just
             // reset the root nav to its root page
-            return appRootNav.goToRoot({
-              updateUrl: false,
-              isNavRoot: true
+            activeNavContainers.forEach((navContainer: NavController) => {
+              navContainer.goToRoot({
+                updateUrl: false,
+                isNavRoot: true
+              });
             });
+            return;
           }
         }
 
         // normal url
-        this._segments = this._serializer.parse(browserUrl);
-        // this is so dirty I need a shower
-        this._loadNavFromPath(((appRootNav as any) as NavController));
+        const segments = this.getCurrentSegments(browserUrl);
+        segments
+          .map(segment => {
+            // find the matching nav container
+            for (const navContainer of activeNavContainers) {
+              const nav = getNavFromTree(navContainer, segment.navId);
+              if (nav) {
+                return {
+                  segment: segment,
+                  navContainer: nav
+                };
+              }
+            }
+          })
+          .filter(pair => !!pair)
+          .forEach(pair => {
+            this._loadViewForSegment(pair.navContainer, pair.segment, () => {});
+          });
       }
     }
   }
 
+  getCurrentSegments(browserUrl?: string) {
+    if (!browserUrl) {
+      browserUrl = normalizeUrl(this._location.path());
+    }
+    return this._serializer.parse(browserUrl);
+  }
+
   /**
    * Update the deep linker using the NavController's current active view.
    * @internal
    */
   navChange(direction: string) {
-    // all transitions completed
     if (direction) {
-      // get the app's active nav, which is the lowest level one being viewed
-      const activeNav = this._app.getActiveNav();
-      if (activeNav) {
+      const activeNavContainers = this._app.getActiveNavContainers();
+      // the only time you'll ever get a TABS here is when loading directly from a URL
+      // this method will be called again when the TAB is loaded
+      // so just don't worry about the TABS for now
+      // if you encounter a TABS, just return
+      for (const activeNavContainer of activeNavContainers) {
+        if (isTabs(activeNavContainer) || (activeNavContainer as NavController).isTransitioning()) {
+          return;
+        }
+      }
 
-        // build up the segments of all the navs from the lowest level
-        this._segments = this._pathFromNavs(activeNav);
+      // okay, get the root navs and build the segments up
+      let segments: NavSegment[] = [];
+      const navContainers: NavigationContainer[] = this._app.getRootNavs();
+      for (const navContainer of navContainers) {
+        const segmentsForNav = this.getSegmentsFromNav(navContainer);
+         segments = segments.concat(segmentsForNav);
+      }
+      segments = segments.filter(segment => !!segment);
+      if (segments.length) {
+        const browserUrl = this._serializer.serialize(segments);
+        this._updateLocation(browserUrl, direction);
+      }
+    }
+  }
 
-        // build a string URL out of the Path
-        const browserUrl = this._serializer.serialize(this._segments);
+  getSegmentsFromNav(nav: NavigationContainer): NavSegment[] {
+    let segments: NavSegment[] = [];
+    if (isNav(nav)) {
+      segments.push(this.getSegmentFromNav(nav as NavController));
+    } else if (isTab(nav)) {
+      segments.push(this.getSegmentFromTab(nav));
+    }
+    nav.getActiveChildNavs().forEach(child => {
+      segments = segments.concat(this.getSegmentsFromNav(child));
+    });
+    return segments;
+  }
 
-        // update the browser's location
-        this._updateLocation(browserUrl, direction);
+  getSegmentFromNav(nav: NavController, component?: any, data?: any): NavSegment {
+     if (!component) {
+      const viewController = nav.getActive(true);
+      if (viewController) {
+        component = viewController.component;
+        data = viewController.data;
+      }
+    }
+    return this._serializer.serializeComponent(nav, component, data);
+  }
+
+  getSegmentFromTab(navContainer: NavigationContainer, component?: any, data?: any): NavSegment {
+    if (navContainer && navContainer.parent) {
+      const tabsNavContainer = navContainer.parent as NavigationContainer;
+      const activeChildNavs = tabsNavContainer.getActiveChildNavs();
+      if (activeChildNavs && activeChildNavs.length) {
+        const activeChildNav = activeChildNavs[0];
+        const viewController = (activeChildNav as NavController).getActive(true);
+        if (viewController) {
+          component = viewController.component;
+          data = viewController.data;
+        }
+        return this._serializer.serializeComponent(tabsNavContainer, component, data);
       }
     }
   }
@@ -196,118 +267,20 @@ export class DeepLinker {
   /**
    * @internal
    */
-  createUrl(nav: any, nameOrComponent: any, data: any, prepareExternalUrl: boolean = true): string {
+  createUrl(navContainer: NavigationContainer, nameOrComponent: any, _data: any, prepareExternalUrl: boolean = true): string {
     // create a segment out of just the passed in name
-    const segment = this._serializer.createSegmentFromName(nameOrComponent);
+    const segment = this._serializer.createSegmentFromName(navContainer, nameOrComponent);
+    const allSegments = this.getCurrentSegments();
     if (segment) {
-      const path = this._pathFromNavs(nav, segment.component, data);
-      // serialize the segments into a browser URL
-      // and prepare the URL with the location and return
-      const url = this._serializer.serialize(path);
-      return prepareExternalUrl ? this._location.prepareExternalUrl(url) : url;
-    }
-    return '';
-  }
-
-  /**
-   * Build a browser URL out of this NavController. Climbs up the tree
-   * of NavController's to create a string representation of all the
-   * NavControllers state.
-   *
-   * @internal
-   */
-  _pathFromNavs(nav: NavController, component?: any, data?: any): NavSegment[] {
-    const segments: NavSegment[] = [];
-    let view: ViewController;
-    let segment: NavSegment;
-    let tabSelector: string;
-
-    // recursivly climb up the nav ancestors
-    // and set each segment's data
-    while (nav) {
-      // this could be an ion-nav, ion-tab or ion-portal
-      // if a component and data was already passed in then use it
-      // otherwise get this nav's active view controller
-      if (!component && isNav(nav)) {
-        view = nav.getActive(true);
-        if (view) {
-          component = view.component;
-          data = view.data;
+      for (let i = 0; i < allSegments.length; i++) {
+        if (allSegments[i].navId === navContainer.name || allSegments[i].navId === navContainer.id) {
+          allSegments[i] = segment;
+          const url = this._serializer.serialize(allSegments);
+          return prepareExternalUrl ? this._location.prepareExternalUrl(url) : url;
         }
       }
-
-      // the ion-nav or ion-portal has an active view
-      // serialize the component and its data to a NavSegment
-      segment = this._serializer.serializeComponent(component, data);
-
-      // reset the component/data
-      component = data = null;
-
-      if (!segment) {
-        break;
-      }
-
-      // add the segment to the path
-      segments.push(segment);
-
-      if (isTab(nav)) {
-        // this nav is a Tab, which is a child of Tabs
-        // add a segment to represent which Tab is the selected one
-        tabSelector = this._getTabSelector(<any>nav);
-        segments.push({
-          id: tabSelector,
-          name: tabSelector,
-          component: null,
-          data: null
-        });
-
-        // a parent to Tab is a Tabs
-        // we should skip over any Tabs and go to the next parent
-        nav = nav.parent && nav.parent.parent;
-
-      } else {
-        // this is an ion-nav
-        // climb up to the next parent
-        nav = nav.parent;
-      }
-    }
-
-    // segments added from bottom to top, so Ti esrever dna ti pilf
-    return segments.reverse();
-  }
-
-  /**
-   * @internal
-   */
-  _getTabSelector(tab: Tab): string {
-    if (isPresent(tab.tabUrlPath)) {
-      return tab.tabUrlPath;
-    }
-    if (isPresent(tab.tabTitle)) {
-      return this._serializer.formatUrlPart(tab.tabTitle);
     }
-    return `tab-${tab.index}`;
-  }
-
-  /**
-   * @internal
-   */
-  getSelectedTabIndex(tabsNav: Tabs, pathName: string, fallbackIndex: number = 0): number {
-    // we found a segment which probably represents which tab to select
-    const indexMatch = pathName.match(/tab-(\d+)/);
-    if (indexMatch) {
-      // awesome, the segment name was something "tab-0", and
-      // the numbe represents which tab to select
-      return parseInt(indexMatch[1], 10);
-    }
-
-    // wasn't in the "tab-0" format so maybe it's using a word
-    const tab = tabsNav._tabs.find(t => {
-      return (isPresent(t.tabUrlPath) && t.tabUrlPath === pathName) ||
-             (isPresent(t.tabTitle) && this._serializer.formatUrlPart(t.tabTitle) === pathName);
-    });
-
-    return isPresent(tab) ? tab.index : fallbackIndex;
+    return '';
   }
 
   /**
@@ -316,22 +289,12 @@ export class DeepLinker {
    * where it lives in the path and load up the correct component.
    * @internal
    */
-  initNav(nav: any): NavSegment {
-    const path = this._segments;
-
-    if (nav && path.length) {
-      if (!nav.parent) {
-        // a nav without a parent is always the first nav segment
-        path[0].navId = nav.id;
-        return path[0];
-      }
-
-      for (var i = 1; i < path.length; i++) {
-        if (path[i - 1].navId === nav.parent.id) {
-          // this nav's parent segment is the one before this segment's index
-          path[i].navId = nav.id;
-          return path[i];
-        }
+  getSegmentByNavIdOrName(navId: string, name: string): NavSegment {
+    const browserUrl = normalizeUrl(this._location.path());
+    const segments = this._serializer.parse(browserUrl);
+    for (const segment of segments) {
+      if (segment.navId === navId || segment.navId === name) {
+        return segment;
       }
     }
     return null;
@@ -358,86 +321,6 @@ export class DeepLinker {
     });
   }
 
-  /**
-   * Using the known Path of Segments, walk down all descendents
-   * from the root NavController and load each NavController according
-   * to each Segment. This is usually called after a browser URL and
-   * Path changes and needs to update all NavControllers to match
-   * the new browser URL. Because the URL is already known, it will
-   * not update the browser's URL when transitions have completed.
-   *
-   * @internal
-   */
-  _loadNavFromPath(nav: NavController, done?: Function) {
-    if (!nav) {
-      done && done();
-
-    } else {
-      this._loadViewFromSegment(nav, () => {
-        this._loadNavFromPath(nav.getActiveChildNav(), done);
-      });
-    }
-  }
-
-  /**
-   * @internal
-   */
-  _loadViewFromSegment(navInstance: any, done: Function) {
-    // load up which nav ids belong to its nav segment
-    let segment = this.initNav(navInstance);
-    if (!segment) {
-      done();
-      return;
-    }
-
-    if (isTabs(navInstance)) {
-      (<Tabs>navInstance).select(
-        this.getSelectedTabIndex((<Tabs>navInstance), segment.name),
-        {
-          updateUrl: false,
-          animate: false
-        }
-      );
-      done();
-      return;
-    }
-
-    let nav = <NavController>navInstance;
-
-    // walk backwards to see if the exact view we want to show here
-    // is already in the stack that we can just pop back to
-    let view: ViewController;
-    const count = nav.length() - 1;
-    for (var i = count; i >= 0; i--) {
-      view = nav.getByIndex(i);
-
-      if (view && view.id === segment.id) {
-        // hooray! we've already got a view loaded in the stack
-        // matching the view they wanted to show
-        if (i === count) {
-          // this is the last view in the stack and it's the same
-          // as the segment so there's no change needed
-          done();
-
-        } else {
-          // it's not the exact view as the end
-          // let's have this nav go back to this exact view
-          nav.popTo(view, {
-            animate: false,
-            updateUrl: false,
-          }, done);
-        }
-        return;
-      }
-    }
-
-    // ok, so they must be pushing a new view to the stack
-    // since we didn't find this same component already in the stack
-    nav.push(segment.component, segment.data, {
-      id: segment.id, animate: false, updateUrl: false
-    }, done);
-  }
-
   /**
    * @internal
    */
@@ -474,6 +357,80 @@ export class DeepLinker {
     }
   }
 
+  /**
+   * @internal
+   */
+  _getTabSelector(tab: Tab): string {
+    if (isPresent(tab.tabUrlPath)) {
+      return tab.tabUrlPath;
+    }
+    if (isPresent(tab.tabTitle)) {
+      return formatUrlPart(tab.tabTitle);
+    }
+    return `tab-${tab.index}`;
+  }
+
+  /**
+   * Using the known Path of Segments, walk down all descendents
+   * from the root NavController and load each NavController according
+   * to each Segment. This is usually called after a browser URL and
+   * Path changes and needs to update all NavControllers to match
+   * the new browser URL. Because the URL is already known, it will
+   * not update the browser's URL when transitions have completed.
+   *
+   * @internal
+   */
+  _loadViewForSegment(navContainer: NavigationContainer, segment: NavSegment, done: Function) {
+    if (!segment) {
+      return done();
+    }
+
+    if (isTabs(navContainer) || (isTab(navContainer) && navContainer.parent)) {
+      const tabs = <Tabs> <any> (isTabs(navContainer) ? navContainer : navContainer.parent);
+      const selectedIndex = tabs._getSelectedTabIndex(segment.secondaryId);
+      const tab = tabs.getByIndex(selectedIndex);
+      tab._lazyRootFromUrl = segment.name;
+      tab._lazyRootFromUrlData = segment.data;
+      tabs.select(tab, {
+        updateUrl: false,
+        animate: false
+      }, true);
+      return done();
+    }
+
+    const navController = <NavController> <any> navContainer;
+    const numViews = navController.length() - 1;
+    // walk backwards to see if the exact view we want to show here
+    // is already in the stack that we can just pop back to
+    for (let i = numViews; i >= 0; i--) {
+      const viewController = navController.getByIndex(i);
+      if (viewController && (viewController.id === segment.id || viewController.id === segment.name)) {
+        // hooray! we've already got a view loaded in the stack
+        // matching the view they wanted to show
+        if (i === numViews) {
+          // this is the last view in the stack and it's the same
+          // as the segment so there's no change needed
+          return done();
+        } else {
+          // it's not the exact view as the end
+          // let's have this nav go back to this exact view
+          return navController.popTo(viewController, {
+            animate: false,
+            updateUrl: false,
+          }, {}, done);
+        }
+      }
+    }
+
+    // ok, so we don't know about a view that they're navigating to
+    // so we might as well just call setRoot and make tthe view the first view
+    // this seems like the least bad option
+    return navController.setRoot(segment.component || segment.name, segment.data, {
+      id: segment.id, animate: false, updateUrl: false
+    }, done);
+
+  }
+
 }
 
 
@@ -496,3 +453,13 @@ export function normalizeUrl(browserUrl: string): string {
   }
   return browserUrl;
 }
+
+export function getNavFromTree(nav: NavigationContainer, id: string) {
+  while (nav) {
+    if (nav.id === id || nav.name === id) {
+      return nav;
+    }
+    nav = nav.parent;
+  }
+  return null;
+}
diff --git a/src/navigation/ionic-page.ts b/src/navigation/ionic-page.ts
index 4ca7319f485..bc7056da1df 100644
--- a/src/navigation/ionic-page.ts
+++ b/src/navigation/ionic-page.ts
@@ -263,7 +263,7 @@ export interface IonicPageMetadata {
  * the application.
  *
  */
-export function IonicPage(config?: IonicPageMetadata): ClassDecorator {
+export function IonicPage(_config?: IonicPageMetadata): ClassDecorator {
   return function(clazz: any) {
     return clazz;
   };
diff --git a/src/navigation/nav-controller-base.ts b/src/navigation/nav-controller-base.ts
index 48d07affb9f..19531c1e9c5 100644
--- a/src/navigation/nav-controller-base.ts
+++ b/src/navigation/nav-controller-base.ts
@@ -1,18 +1,41 @@
-import { ComponentRef, Input, ComponentFactoryResolver, ElementRef, ErrorHandler, EventEmitter, NgZone, ReflectiveInjector, Renderer, ViewContainerRef } from '@angular/core';
+import {
+  ComponentFactoryResolver,
+  ComponentRef,
+  ElementRef,
+  ErrorHandler,
+  EventEmitter,
+  Input,
+  NgZone,
+  ReflectiveInjector,
+  Renderer,
+  ViewContainerRef
+} from '@angular/core';
 
 import { AnimationOptions } from '../animations/animation';
 import { App } from '../components/app/app';
 import { Config } from '../config/config';
-import { convertToViews, NavOptions, NavResult, DIRECTION_BACK, DIRECTION_FORWARD, INIT_ZINDEX,
-         TransitionInstruction, STATE_NEW, STATE_INITIALIZED, STATE_ATTACHED, STATE_DESTROYED } from './nav-util';
+import {
+  DIRECTION_BACK,
+  DIRECTION_FORWARD,
+  INIT_ZINDEX,
+  NavOptions,
+  NavResult,
+  STATE_ATTACHED,
+  STATE_DESTROYED,
+  STATE_INITIALIZED,
+  STATE_NEW,
+  TransitionInstruction,
+  convertToViews,
+} from './nav-util';
+
 import { setZIndex } from './nav-util';
 import { DeepLinker } from './deep-linker';
 import { DomController } from '../platform/dom-controller';
 import { GestureController } from '../gestures/gesture-controller';
-import { isBlank, isNumber, isPresent, isTrueProperty, assert, removeArrayItem } from '../util/util';
-import { isViewController, ViewController } from './view-controller';
+import { assert, isBlank, isNumber, isPresent, isTrueProperty } from '../util/util';
+import { ViewController, isViewController } from './view-controller';
 import { Ion } from '../components/ion';
-import { Keyboard } from '../platform/keyboard';
+import { NavigationContainer } from './navigation-container';
 import { NavController } from './nav-controller';
 import { NavParams } from './nav-params';
 import { Platform } from '../platform/platform';
@@ -26,7 +49,7 @@ import { TransitionController } from '../transitions/transition-controller';
  */
 export class NavControllerBase extends Ion implements NavController {
 
-  _children: any[] = [];
+  _children: NavigationContainer[];
   _ids: number = -1;
   _init = false;
   _isPortal: boolean;
@@ -39,6 +62,7 @@ export class NavControllerBase extends Ion implements NavController {
   _viewport: ViewContainerRef;
   _views: ViewController[] = [];
   _zIndexOffset: number = 0;
+  _destroyed: boolean;
 
   viewDidLoad: EventEmitter<any> = new EventEmitter();
   viewWillEnter: EventEmitter<any> = new EventEmitter();
@@ -48,6 +72,7 @@ export class NavControllerBase extends Ion implements NavController {
   viewWillUnload: EventEmitter<any> = new EventEmitter();
 
   id: string;
+  name: string;
 
   @Input()
   get swipeBackEnabled(): boolean {
@@ -63,7 +88,6 @@ export class NavControllerBase extends Ion implements NavController {
     public _app: App,
     public config: Config,
     public plt: Platform,
-    public _keyboard: Keyboard,
     elementRef: ElementRef,
     public _zone: NgZone,
     renderer: Renderer,
@@ -77,8 +101,9 @@ export class NavControllerBase extends Ion implements NavController {
     super(config, elementRef, renderer);
 
     this._sbEnabled = config.getBoolean('swipeBackEnabled');
-
+    this._children = [];
     this.id = 'n' + (++ctrlIds);
+    this._destroyed = false;
   }
 
   push(page: any, params?: any, opts?: NavOptions, done?: () => void): Promise<any> {
@@ -223,9 +248,10 @@ export class NavControllerBase extends Ion implements NavController {
     this._init = true;
     this._trnsId = null;
 
-    // let's see if there's another to kick off
+    // ensure we're not transitioning here
     this.setTransitioning(false);
     this._swipeBackCheck();
+    // let's see if there's another to kick off
     this._nextTrns();
 
     if (ti.done) {
@@ -260,7 +286,7 @@ export class NavControllerBase extends Ion implements NavController {
     if (ti.done) {
       ti.done(false, false, rejectReason);
     }
-    if (ti.reject) {
+    if (ti.reject && !this._destroyed) {
       ti.reject(rejectReason);
     } else {
       ti.resolve(false);
@@ -570,7 +596,6 @@ export class NavControllerBase extends Ion implements NavController {
   }
 
   _transition(enteringView: ViewController, leavingView: ViewController, ti: TransitionInstruction): Promise<NavResult> {
-
     if (!ti.requiresTransition) {
       // transition is not required, so we are already done!
       // they're inserting/removing the views somewhere in the middle or
@@ -750,6 +775,9 @@ export class NavControllerBase extends Ion implements NavController {
 
       // it's safe to enable the app again
       this._app.setEnabled(true);
+      // mark ourselves as not transitioning - `deepLinker navchange` requires this
+      // TODO - probably could be resolved in a better way
+      this.setTransitioning(false);
 
       if (!this.hasChildren() && opts.updateUrl !== false) {
         // notify deep linker of the nav change
@@ -760,7 +788,7 @@ export class NavControllerBase extends Ion implements NavController {
       if (opts.keyboardClose !== false) {
         // the keyboard is still open!
         // no problem, let's just close for them
-        this._keyboard.close();
+        this.plt.focusOutActiveElement();
       }
     }
 
@@ -829,35 +857,38 @@ export class NavControllerBase extends Ion implements NavController {
   _cleanup(activeView: ViewController) {
     // ok, cleanup time!! Destroy all of the views that are
     // INACTIVE and come after the active view
-    const activeViewIndex = this._views.indexOf(activeView);
-    const views = this._views;
-    let reorderZIndexes = false;
-    let view: ViewController;
-    let i: number;
+    // only do this if the views exist, though
+    if (!this._destroyed) {
+      const activeViewIndex = this._views.indexOf(activeView);
+      const views = this._views;
+      let reorderZIndexes = false;
+      let view: ViewController;
+      let i: number;
 
-    for (i = views.length - 1; i >= 0; i--) {
-      view = views[i];
-      if (i > activeViewIndex) {
-        // this view comes after the active view
-        // let's unload it
-        this._willUnload(view);
-        this._destroyView(view);
-
-      } else if (i < activeViewIndex && !this._isPortal) {
-        // this view comes before the active view
-        // and it is not a portal then ensure it is hidden
-        view._domShow(false, this._renderer);
-      }
-      if (view._zIndex <= 0) {
-        reorderZIndexes = true;
+      for (i = views.length - 1; i >= 0; i--) {
+        view = views[i];
+        if (i > activeViewIndex) {
+          // this view comes after the active view
+          // let's unload it
+          this._willUnload(view);
+          this._destroyView(view);
+
+        } else if (i < activeViewIndex && !this._isPortal) {
+          // this view comes before the active view
+          // and it is not a portal then ensure it is hidden
+          view._domShow(false, this._renderer);
+        }
+        if (view._zIndex <= 0) {
+          reorderZIndexes = true;
+        }
       }
-    }
 
-    if (!this._isPortal && reorderZIndexes) {
-      for (i = 0; i < views.length; i++) {
-        view = views[i];
-        // ******** DOM WRITE ****************
-        view._setZIndex(view._zIndex + INIT_ZINDEX + 1, this._renderer);
+      if (!this._isPortal && reorderZIndexes) {
+        for (i = 0; i < views.length; i++) {
+          view = views[i];
+          // ******** DOM WRITE ****************
+          view._setZIndex(view._zIndex + INIT_ZINDEX + 1, this._renderer);
+        }
       }
     }
   }
@@ -957,19 +988,23 @@ export class NavControllerBase extends Ion implements NavController {
   }
 
   hasChildren(): boolean {
-    return this._children.length > 0;
+    return this._children && this._children.length > 0;
   }
 
-  getActiveChildNav(): any {
-    return this._children[this._children.length - 1];
+  getActiveChildNavs(): any[] {
+    return this._children;
+  }
+
+  getAllChildNavs(): any[] {
+    return this._children;
   }
 
-  registerChildNav(nav: any) {
-    this._children.push(nav);
+  registerChildNav(container: NavigationContainer) {
+    this._children.push(container);
   }
 
   unregisterChildNav(nav: any) {
-    removeArrayItem(this._children, nav);
+    this._children = this._children.filter(child => child !== nav);
   }
 
   destroy() {
@@ -990,6 +1025,8 @@ export class NavControllerBase extends Ion implements NavController {
     if (this.parent && this.parent.unregisterChildNav) {
       this.parent.unregisterChildNav(this);
     }
+
+    this._destroyed = true;
   }
 
   swipeBackStart() {
@@ -1044,7 +1081,7 @@ export class NavControllerBase extends Ion implements NavController {
   canSwipeBack(): boolean {
     return (this._sbEnabled &&
             !this._isPortal &&
-            this._children.length <= 1 &&
+            !this._children.length &&
             !this.isTransitioning() &&
             this._app.isEnabled() &&
             this.canGoBack());
@@ -1110,6 +1147,18 @@ export class NavControllerBase extends Ion implements NavController {
     return this._views;
   }
 
+  /**
+   * Return a view controller
+   */
+  getViewById(id: string): ViewController {
+    for (const vc of this._views) {
+      if (vc && vc.id === id) {
+        return vc;
+      }
+    }
+    return null;
+  }
+
   isSwipeBackEnabled(): boolean {
     return this._sbEnabled;
   }
@@ -1135,6 +1184,31 @@ export class NavControllerBase extends Ion implements NavController {
     content && content.resize();
   }
 
+  goToRoot(_opts: NavOptions): Promise<any> {
+    return Promise.reject(new Error('goToRoot needs to be implemented by child class'));
+  }
+
+  /*
+   * @private
+   */
+  getType() {
+    return 'nav';
+  }
+
+  /*
+   * @private
+   */
+  getSecondaryIdentifier(): string {
+    return null;
+  }
+
+  /**
+   * Returns the active child navigation.
+   */
+  getActiveChildNav(): any {
+    console.warn('(getActiveChildNav) is deprecated and will be removed in the next major release. Use getActiveChildNavs instead.');
+    return this._children[this._children.length - 1];
+  }
 }
 
 let ctrlIds = -1;
diff --git a/src/navigation/nav-controller.ts b/src/navigation/nav-controller.ts
index 9aa64fd65a0..58be7a19c30 100644
--- a/src/navigation/nav-controller.ts
+++ b/src/navigation/nav-controller.ts
@@ -4,7 +4,7 @@ import { Config } from '../config/config';
 import { NavOptions } from './nav-util';
 import { Page } from './nav-util';
 import { ViewController } from './view-controller';
-
+import { NavigationContainer } from './navigation-container';
 
 /**
  * @name NavController
@@ -346,7 +346,7 @@ import { ViewController } from './view-controller';
  *
  * @see {@link /docs/components#navigation Navigation Component Docs}
  */
-export abstract class NavController {
+export abstract class NavController implements NavigationContainer {
 
   /**
    * Observable to be subscribed to when a component is loaded.
@@ -389,6 +389,11 @@ export abstract class NavController {
    */
   id: string;
 
+  /**
+   * @hidden
+   */
+  name: string;
+
   /**
    * The parent navigation instance. If this is the root nav, then
    * it'll be `null`. A `Tab` instance's parent is `Tabs`, otherwise
@@ -512,6 +517,7 @@ export abstract class NavController {
    * @returns {Promise} Returns a promise which is resolved when the transition has completed.
    */
   abstract setRoot(pageOrViewCtrl: Page | string | ViewController, params?: any, opts?: NavOptions, done?: Function): Promise<any>;
+  abstract goToRoot(options: NavOptions): Promise<any>;
 
   /**
    * Set the views of the current navigation stack and navigate to the
@@ -583,16 +589,27 @@ export abstract class NavController {
    */
   abstract getViews(): Array<ViewController>;
 
+  /**
+   * Returns a list of the active child navigation.
+   */
+  abstract getActiveChildNavs(): any[];
+
   /**
    * Returns the active child navigation.
    */
   abstract getActiveChildNav(): any;
 
+  /**
+   * Returns a list of all child navigation containers
+   */
+  abstract getAllChildNavs(): any[];
+
+
   /**
    * Returns if the nav controller is actively transitioning or not.
    * @return {boolean}
    */
-  abstract isTransitioning(includeAncestors?: boolean): boolean
+  abstract isTransitioning(includeAncestors?: boolean): boolean;
 
   /**
    * If it's possible to use swipe back or not. If it's not possible
@@ -619,4 +636,17 @@ export abstract class NavController {
    * @hidden
    */
   abstract resize(): void;
+
+
+
+  /*
+   * @hidden
+   */
+  abstract getType(): string;
+
+  /*
+   * @hidden
+   */
+  abstract getSecondaryIdentifier(): string;
+
 }
diff --git a/src/navigation/nav-interfaces.ts b/src/navigation/nav-interfaces.ts
index c20cda596f4..479fa2424fb 100644
--- a/src/navigation/nav-interfaces.ts
+++ b/src/navigation/nav-interfaces.ts
@@ -1,20 +1,26 @@
 import { NavOptions } from './nav-util';
+import { ViewController } from './view-controller';
 
 export interface Nav {
   goToRoot(opts: NavOptions): Promise<any>;
 }
 
 export interface Tabs {
+  viewCtrl: ViewController;
   _tabs: Tab[];
-  select(tabOrIndex: number | Tab, opts: NavOptions): void;
+  select(tabOrIndex: number | Tab, opts: NavOptions, fromUrl: boolean): void;
   _top: number;
   setTabbarPosition(top: number, bottom: number): void;
+  _getSelectedTabIndex(secondaryId: string, fallbackIndex?: number): number;
+  getByIndex(index: number): Tab;
 }
 
 export interface Tab {
   tabUrlPath: string;
   tabTitle: string;
   index: number;
+  _lazyRootFromUrl: string;
+  _lazyRootFromUrlData: string;
 }
 
 export interface Content {
diff --git a/src/navigation/nav-util.ts b/src/navigation/nav-util.ts
index 58fa528a48c..1c947cacbe4 100644
--- a/src/navigation/nav-util.ts
+++ b/src/navigation/nav-util.ts
@@ -1,9 +1,8 @@
 import { Renderer, TypeDecorator } from '@angular/core';
-
 import { DeepLinker } from './deep-linker';
 import { IonicPageMetadata } from './ionic-page';
 import { isArray, isPresent } from '../util/util';
-import { isViewController, ViewController } from './view-controller';
+import { ViewController, isViewController } from './view-controller';
 import { NavControllerBase } from './nav-controller-base';
 import { Transition } from '../transitions/transition';
 
@@ -17,7 +16,9 @@ export function getComponent(linker: DeepLinker, nameOrPageOrView: any, params?:
 
   if (typeof nameOrPageOrView === 'string') {
     return linker.getComponentFromName(nameOrPageOrView).then((component) => {
-      return new ViewController(component, params);
+      const vc = new ViewController(component, params);
+      vc.id = nameOrPageOrView;
+      return vc;
     });
   }
 
@@ -98,7 +99,15 @@ export function isTab(nav: any): boolean {
 
 export function isNav(nav: any): boolean {
   // Nav (ion-nav), Tab (ion-tab), Portal (ion-portal)
-  return !!nav && !!nav.push;
+  return !!nav && !!nav.push && nav.getType() === 'nav';
+}
+
+export function linkToSegment(navId: string, type: string, secondaryId: string, link: NavLink): NavSegment {
+  const segment = <NavSegment> Object.assign({}, link);
+  segment.navId = navId;
+  segment.type = type;
+  segment.secondaryId = secondaryId;
+  return segment;
 }
 
 /**
@@ -138,8 +147,8 @@ export interface NavLink {
   loadChildren?: string;
   name?: string;
   segment?: string;
-  parts?: string[];
-  partsLen?: number;
+  segmentParts?: string[];
+  segmentPartsLen?: number;
   staticLen?: number;
   dataLen?: number;
   dataKeys?: {[key: string]: boolean};
@@ -154,14 +163,34 @@ export interface NavResult {
   direction?: string;
 }
 
-export interface NavSegment {
+export interface NavSegment extends DehydratedSegment {
+  type: string;
+  navId: string;
+  secondaryId: string;
+  requiresExplicitNavPrefix?: boolean;
+}
+
+export interface DehydratedSegment {
   id: string;
   name: string;
   component?: any;
   loadChildren?: string;
   data: any;
-  navId?: string;
   defaultHistory?: NavSegment[];
+  secondaryId?: string;
+}
+
+export interface DehydratedSegmentPair {
+  segments: DehydratedSegment[];
+  navGroup: NavGroup;
+}
+
+export interface NavGroup {
+  type: string;
+  navId: string;
+  secondaryId: string;
+  segmentPieces?: string[];
+  tabSegmentPieces?: string[];
 }
 
 export interface NavOptions {
@@ -217,3 +246,6 @@ export const INIT_ZINDEX = 100;
 export const DIRECTION_BACK = 'back';
 export const DIRECTION_FORWARD = 'forward';
 export const DIRECTION_SWITCH = 'switch';
+
+export const NAV = 'nav';
+export const TABS = 'tabs';
diff --git a/src/navigation/navigation-container.ts b/src/navigation/navigation-container.ts
new file mode 100644
index 00000000000..a5bbb932903
--- /dev/null
+++ b/src/navigation/navigation-container.ts
@@ -0,0 +1,14 @@
+import { NavController } from './nav-controller';
+
+/**
+ * @hidden
+ */
+export interface NavigationContainer {
+  id: string;
+  name: string;
+  parent: NavController;
+  getActiveChildNavs(): NavigationContainer[];
+  getAllChildNavs?(): NavigationContainer[];
+  getType(): string;
+  getSecondaryIdentifier(): string;
+}
diff --git a/src/navigation/overlay-proxy.ts b/src/navigation/overlay-proxy.ts
index ac992a5ee9c..c84c014d1eb 100644
--- a/src/navigation/overlay-proxy.ts
+++ b/src/navigation/overlay-proxy.ts
@@ -44,7 +44,7 @@ export class OverlayProxy {
 
   dismiss(data?: any, role?: string, navOptions?: NavOptions): Promise<any> {
     if (this.overlay) {
-      return this.overlay.dismiss();
+      return this.overlay.dismiss(data, role, navOptions);
     }
   }
 
diff --git a/src/navigation/swipe-back.ts b/src/navigation/swipe-back.ts
index b4f09cb37c6..ba730084de1 100644
--- a/src/navigation/swipe-back.ts
+++ b/src/navigation/swipe-back.ts
@@ -1,6 +1,6 @@
 import { swipeShouldReset } from '../util/util';
 import { DomController } from '../platform/dom-controller';
-import { GestureController, GESTURE_PRIORITY_GO_BACK_SWIPE, GESTURE_GO_BACK_SWIPE } from '../gestures/gesture-controller';
+import { GESTURE_GO_BACK_SWIPE, GESTURE_PRIORITY_GO_BACK_SWIPE, GestureController } from '../gestures/gesture-controller';
 import { NavControllerBase } from './nav-controller-base';
 import { Platform } from '../platform/platform';
 import { SlideData } from '../gestures/slide-gesture';
@@ -42,7 +42,7 @@ export class SwipeBackGesture extends SlideEdgeGesture {
     );
   }
 
-  onSlideBeforeStart(ev: any) {
+  onSlideBeforeStart(_ev: any) {
     this._nav.swipeBackStart();
   }
 
@@ -54,7 +54,7 @@ export class SwipeBackGesture extends SlideEdgeGesture {
     this._nav.swipeBackProgress(stepValue);
   }
 
-  onSlideEnd(slide: SlideData, ev: any) {
+  onSlideEnd(slide: SlideData, _ev: any) {
     const velocity = slide.velocity;
     const currentStepValue = (slide.distance / slide.max);
     const isResetDirecction = velocity < 0;
diff --git a/src/navigation/test/deep-linker.spec.ts b/src/navigation/test/deep-linker.spec.ts
index 147074cfddc..5f23f4a6334 100644
--- a/src/navigation/test/deep-linker.spec.ts
+++ b/src/navigation/test/deep-linker.spec.ts
@@ -1,8 +1,20 @@
-import { DeepLinker, normalizeUrl } from '../deep-linker';
+import * as deepLinker from '../deep-linker';
+import { NavSegment } from '../nav-util';
 import { UrlSerializer } from '../url-serializer';
-import { mockApp, mockDeepLinkConfig, mockNavController, mockLocation,
-         mockModuleLoader, mockTab, mockTabs, mockViews, mockView, noop,
-         MockView1, MockView2, MockView3 } from '../../util/mock-providers';
+import {
+  MockView1,
+  MockView2,
+  mockApp,
+  mockDeepLinkConfig,
+  mockLocation,
+  mockModuleLoader,
+  mockNavController,
+  mockTab,
+  mockTabs,
+  mockView,
+  mockViews,
+  noop
+} from '../../util/mock-providers';
 
 
 describe('DeepLinker', () => {
@@ -67,12 +79,20 @@ describe('DeepLinker', () => {
       let view2 = mockView(MockView2);
       view2.id = 'MockPage2';
       mockViews(nav, [view1, view2]);
-      linker._segments = serializer.parse('/MockPage2');
+
+      const segment: NavSegment = {
+        id: view2.id,
+        name: 'MockPage2',
+        data: null,
+        type: 'nav',
+        navId: 'n1',
+        secondaryId: null,
+      };
 
       spyOn(nav, 'push');
       spyOn(nav, 'popTo');
 
-      linker._loadViewFromSegment(nav, noop);
+      linker._loadViewForSegment(nav, segment, noop);
 
       expect(nav.push).not.toHaveBeenCalled();
       expect(nav.popTo).not.toHaveBeenCalled();
@@ -85,12 +105,20 @@ describe('DeepLinker', () => {
       let view2 = mockView(MockView2);
       view2.id = 'MockPage2';
       mockViews(nav, [view1, view2]);
-      linker._segments = serializer.parse('/MockPage1');
+
+      const segment: NavSegment = {
+        id: view1.id,
+        name: 'MockPage1',
+        data: null,
+        type: 'nav',
+        navId: 'n1',
+        secondaryId: null,
+      };
 
       spyOn(nav, 'push');
       spyOn(nav, 'popTo');
 
-      linker._loadViewFromSegment(nav, noop);
+      linker._loadViewForSegment(nav, segment, noop);
 
       expect(nav.push).not.toHaveBeenCalled();
       expect(nav.popTo).toHaveBeenCalled();
@@ -98,26 +126,41 @@ describe('DeepLinker', () => {
 
     it('should push a new page', () => {
       let nav = mockNavController();
-      linker._segments = serializer.parse('/MockPage1');
+      const segment: NavSegment = {
+        id: 'MockPage1',
+        name: 'MockPage1',
+        data: null,
+        type: 'nav',
+        navId: 'n1',
+        secondaryId: null,
+      };
 
-      spyOn(nav, 'push');
+      spyOn(nav, 'setRoot');
       spyOn(nav, 'popTo');
 
-      linker._loadViewFromSegment(nav, noop);
+      linker._loadViewForSegment(nav, segment, noop);
 
-      expect(nav.push).toHaveBeenCalled();
+      expect(nav.setRoot).toHaveBeenCalled();
       expect(nav.popTo).not.toHaveBeenCalled();
     });
 
     it('should call select when its a Tabs nav', () => {
-      let tabs = mockTabs();
-      mockTab(tabs);
+      const tabs = mockTabs();
+      const tabOne = mockTab(tabs);
       mockTab(tabs);
-      linker._segments = serializer.parse('/MockPage1');
+
+      const segment: NavSegment = {
+        id: 'MockPage1',
+        name: 'MockPage1',
+        data: null,
+        type: 'tabs',
+        navId: tabs.id,
+        secondaryId: 'tab-one',
+      };
 
       spyOn(tabs, 'select');
 
-      linker._loadViewFromSegment(tabs, noop);
+      linker._loadViewForSegment(tabOne, segment, noop);
 
       expect(tabs.select).toHaveBeenCalled();
     });
@@ -127,71 +170,13 @@ describe('DeepLinker', () => {
       let done = () => { calledDone = true; };
       let nav = mockNavController();
 
-      linker._loadViewFromSegment(nav, done);
+      linker._loadViewForSegment(nav, null, done);
 
       expect(calledDone).toEqual(true);
     });
 
   });
 
-  describe('pathFromNavs', () => {
-
-    it('should climb up through Tab and selected Tabs', () => {
-      let nav1 = mockNavController();
-      let nav1View1 = mockView(MockView1);
-      let nav1View2 = mockView(MockView2);
-      mockViews(nav1, [nav1View1, nav1View2]);
-
-      let tabs = mockTabs();
-      tabs.parent = nav1;
-
-      mockTab(tabs);
-      mockTab(tabs);
-      let tab3 = mockTab(tabs);
-
-      let path = linker._pathFromNavs(tab3, MockView3);
-
-      expect(path.length).toEqual(3);
-      expect(path[0].id).toEqual('viewtwo');
-      expect(path[1].id).toEqual('tab-2');
-      expect(path[2].id).toEqual('viewthree');
-    });
-
-    it('should climb up two navs to set path', () => {
-      let nav1 = mockNavController();
-      let nav1View1 = mockView(MockView1);
-      mockViews(nav1, [nav1View1]);
-
-      let nav2 = mockNavController();
-      nav2.parent = nav1;
-
-      let path = linker._pathFromNavs(nav2, MockView3);
-
-      expect(path.length).toEqual(2);
-      expect(path[0].id).toEqual('viewone');
-      expect(path[0].name).toEqual('viewone');
-      expect(path[1].id).toEqual('viewthree');
-      expect(path[1].name).toEqual('viewthree');
-    });
-
-    it('should get the path for view and nav', () => {
-      let nav = mockNavController();
-      let view = MockView1;
-      let path = linker._pathFromNavs(nav, view, null);
-      expect(path.length).toEqual(1);
-      expect(path[0].id).toEqual('viewone');
-      expect(path[0].name).toEqual('viewone');
-      expect(path[0].component).toEqual(MockView1);
-      expect(path[0].data).toEqual(null);
-    });
-
-    it('should do nothing if blank nav', () => {
-      let path = linker._pathFromNavs(null, null, null);
-      expect(path.length).toEqual(0);
-    });
-
-  });
-
   describe('getTabSelector', () => {
 
     it('should get tab url path selector', () => {
@@ -217,65 +202,16 @@ describe('DeepLinker', () => {
 
   });
 
-  describe('getSelectedTabIndex', () => {
-
-    it('should select index from tab title', () => {
-      let tabs = mockTabs();
-      let tab1 = mockTab(tabs);
-      let tab2 = mockTab(tabs);
-      let tab3 = mockTab(tabs);
-
-      tab1.tabTitle = 'My Account';
-      tab2.tabTitle = 'My Contact';
-      tab3.tabTitle = 'My Settings!!';
-
-      let selectedIndex = linker.getSelectedTabIndex(tabs, 'my-settings');
-      expect(selectedIndex).toEqual(2);
-    });
-
-    it('should select index from tab url path', () => {
-      let tabs = mockTabs();
-      let tab1 = mockTab(tabs);
-      let tab2 = mockTab(tabs);
-      let tab3 = mockTab(tabs);
-
-      tab1.tabUrlPath = 'account';
-      tab2.tabUrlPath = 'contact';
-      tab3.tabUrlPath = 'settings';
-
-      let selectedIndex = linker.getSelectedTabIndex(tabs, 'settings');
-      expect(selectedIndex).toEqual(2);
-    });
-
-    it('should select index 2 from tab-2 format', () => {
-      let tabs = mockTabs();
-      mockTab(tabs);
-      mockTab(tabs);
-      mockTab(tabs);
-
-      let selectedIndex = linker.getSelectedTabIndex(tabs, 'tab-2');
-      expect(selectedIndex).toEqual(2);
-    });
-
-    it('should select index 0 when not found', () => {
-      let tabs = mockTabs();
-      mockTab(tabs);
-      mockTab(tabs);
-      mockTab(tabs);
-
-      let selectedIndex = linker.getSelectedTabIndex(tabs, 'notfound');
-      expect(selectedIndex).toEqual(0);
-    });
-
-  });
-
   describe('initViews', () => {
 
     it('should return an array with one view controller when there isnt default history', (done: Function) => {
-      const knownSegment = {
+      const knownSegment: NavSegment = {
         id: 'idk',
         name: 'viewone',
-        data: {}
+        data: {},
+        type: 'nav',
+        navId: 'n1',
+        secondaryId: null
       };
       const promise = linker.initViews(knownSegment);
 
@@ -290,125 +226,19 @@ describe('DeepLinker', () => {
     });
   });
 
-  describe('initNav', () => {
-
-    it('should load root view that contains tabs, and the selected tabs view', () => {
-      let nav1 = mockNavController();
-      nav1.id = 'nav1';
-      nav1.parent = null;
-      let tabs = mockTabs();
-      tabs.id = 'tabs';
-      tabs.parent = nav1;
-      let tab1 = mockTab(tabs);
-      tab1.id = 'tab1';
-      tab1.parent = tabs;
-      let tab2 = mockTab(tabs);
-      tab2.id = 'tab2';
-      tab2.parent = tabs;
-
-      linker._segments = serializer.parse('/viewone/account/viewtwo');
-
-      let navSegment = linker.initNav(nav1);
-      expect(navSegment.navId).toEqual('nav1');
-      expect(navSegment.id).toEqual('viewone');
-
-      let tabsSegment = linker.initNav(tabs);
-      expect(tabsSegment.navId).toEqual('tabs');
-      expect(tabsSegment.id).toEqual('account');
-
-      let tabSegment = linker.initNav(tab2);
-      expect(tabSegment.navId).toEqual('tab2');
-      expect(tabSegment.id).toEqual('viewtwo');
-    });
-
-    it('should load root and descendant nav', () => {
-      let nav1 = mockNavController();
-      nav1.parent = null;
-      nav1.id = 'nav1';
-      let nav2 = mockNavController();
-      nav2.parent = nav1;
-      nav2.id = 'nav2';
-      let nav3 = mockNavController();
-      nav3.parent = nav2;
-      nav3.id = 'nav3';
-
-      linker._segments = serializer.parse('/viewone/viewtwo/viewthree');
-
-      let p1 = linker.initNav(nav1);
-      expect(p1.navId).toEqual('nav1');
-      expect(p1.id).toEqual('viewone');
-
-      let p2 = linker.initNav(nav2);
-      expect(p2.navId).toEqual('nav2');
-      expect(p2.id).toEqual('viewtwo');
-
-      let p3 = linker.initNav(nav3);
-      expect(p3.navId).toEqual('nav3');
-      expect(p3.id).toEqual('viewthree');
-    });
-
-    it('should load root nav', () => {
-      let nav = mockNavController();
-      nav.id = 'myNavId';
-      linker._segments = serializer.parse('MockPage1');
-      let p = linker.initNav(nav);
-      expect(p.navId).toEqual('myNavId');
-      expect(p.id).toEqual('MockPage1');
-    });
-
-    it('should return null when no nav', () => {
-      linker._segments = serializer.parse('MockPage1');
-      expect(linker.initNav(null)).toEqual(null);
-    });
-
-    it('should return null when segments in path', () => {
-      let nav = mockNavController();
-      linker._segments = [];
-      expect(linker.initNav(nav)).toEqual(null);
-    });
-
-  });
-
-  describe('createSegmentFromName', () => {
-
-    it('should match by the links string name', () => {
-      let segment = serializer.createSegmentFromName('viewone');
-      expect(segment.component).toEqual(MockView1);
-    });
-
-    it('should get no match', () => {
-      let segment = serializer.createSegmentFromName('nonofindo');
-      expect(segment).toEqual(null);
-    });
-
-  });
-
   describe('urlChange', () => {
 
     it('should use indexAliasUrl when set and browserUrl is /', () => {
-      linker._loadNavFromPath = (nav: any): any => {};
-      linker._app.getRootNav = () => {
-        return mockNavController();
+      linker._app.getActiveNavContainers = () => {
+        return [mockNavController()];
       };
-      spyOn(serializer, 'parse');
-
-      linker._indexAliasUrl = '/tabs-page/recents/tab1-page1';
-      linker._urlChange('/');
+      spyOn(serializer, 'parse').and.returnValue([]);
 
-      expect(serializer.parse).toHaveBeenCalledWith('/tabs-page/recents/tab1-page1');
-    });
-
-    it('should use indexAliasUrl when set and browserUrl is /', () => {
-      linker._loadNavFromPath = (nav: any): any => {};
-      linker._app.getRootNav = () => {
-        return mockNavController();
-      };
-      spyOn(serializer, 'parse');
+      linker._indexAliasUrl = '/tabs/t1/tab-one/some/parts/of/the/segment';
 
-      linker._indexAliasUrl = '/tabs-page/recents/tab1-page1';
       linker._urlChange('/');
 
-      expect(serializer.parse).toHaveBeenCalledWith('/tabs-page/recents/tab1-page1');
+      expect(serializer.parse).toHaveBeenCalledWith(linker._indexAliasUrl);
     });
 
     it('should historyPush if new url', () => {
@@ -444,6 +274,84 @@ describe('DeepLinker', () => {
       expect(linker._historyPush).not.toHaveBeenCalled();
     });
 
+    it('should go to root when url is /', () => {
+      linker._history = ['/some/fake/url'];
+      spyOn(linker, '_historyPush');
+
+      const navControllerOne = mockNavController();
+      const navControllerTwo = mockNavController();
+
+      linker._app.getActiveNavContainers = () => {
+        return [navControllerOne, navControllerTwo];
+      };
+
+      spyOn(navControllerOne, 'goToRoot');
+      spyOn(navControllerTwo, 'goToRoot');
+
+      linker._urlChange('/');
+
+      expect(navControllerOne.goToRoot).toHaveBeenCalled();
+      expect(navControllerTwo.goToRoot).toHaveBeenCalled();
+    });
+
+    it('should not do anything when there arent any segments', () => {
+      linker._history = ['/some/fake/url'];
+      spyOn(linker, '_historyPush');
+
+      const navControllerOne = mockNavController();
+      const navControllerTwo = mockNavController();
+
+      linker._app.getActiveNavContainers = () => {
+        return [navControllerOne, navControllerTwo];
+      };
+
+      spyOn(linker, 'getCurrentSegments').and.returnValue([]);
+      spyOn(linker, '_loadViewForSegment');
+
+      linker._urlChange('/some/irrelevant/fake/url');
+
+      expect(linker._loadViewForSegment).not.toHaveBeenCalled();
+    });
+
+    it('should load the views for the segments', () => {
+      linker._history = ['/some/fake/url'];
+      spyOn(linker, '_historyPush');
+
+      const navControllerOne = mockNavController();
+      const navControllerTwo = mockNavController();
+
+      const childNavOne = mockNavController();
+      childNavOne.parent = navControllerOne;
+      navControllerOne.registerChildNav(childNavOne);
+
+      const childNavTwo = mockTabs();
+      childNavTwo.parent = navControllerTwo;
+      const tabOne = mockTab(childNavTwo);
+      tabOne.setSelected(true);
+      mockTab(childNavTwo);
+      navControllerTwo.registerChildNav(childNavTwo);
+
+      linker._app.getActiveNavContainers = () => {
+        return [childNavOne, tabOne];
+      };
+
+      const segments = [];
+      segments.push({
+        navId: childNavOne.id
+      });
+      segments.push({
+        navId: tabOne.id
+      });
+      spyOn(linker, 'getCurrentSegments').and.returnValue(segments);
+      const loadViewSpy = spyOn(linker, '_loadViewForSegment');
+
+      linker._urlChange('/some/irrelevant/fake/url');
+
+      expect(loadViewSpy.calls.first().args[0]).toEqual(childNavOne);
+      expect(loadViewSpy.calls.first().args[1]).toEqual(segments[0]);
+      expect(loadViewSpy.calls.mostRecent().args[0]).toEqual(tabOne);
+      expect(loadViewSpy.calls.mostRecent().args[1]).toEqual(segments[1]);
+    });
   });
 
   describe('isBackUrl', () => {
@@ -485,42 +393,300 @@ describe('DeepLinker', () => {
   describe('normalizeUrl', () => {
 
     it('should parse multiple segment with leading and following / path', () => {
-      expect(normalizeUrl('   /MockPage1/MockPage2/   ')).toEqual('/MockPage1/MockPage2');
+      expect(deepLinker.normalizeUrl('   /MockPage1/MockPage2/   ')).toEqual('/MockPage1/MockPage2');
     });
 
     it('should parse following / path', () => {
-      expect(normalizeUrl('MockPage1/')).toEqual('/MockPage1');
+      expect(deepLinker.normalizeUrl('MockPage1/')).toEqual('/MockPage1');
     });
 
     it('should parse leading / path', () => {
-      expect(normalizeUrl('/MockPage1')).toEqual('/MockPage1');
+      expect(deepLinker.normalizeUrl('/MockPage1')).toEqual('/MockPage1');
     });
 
     it('should parse / path', () => {
-      expect(normalizeUrl('/')).toEqual('/');
+      expect(deepLinker.normalizeUrl('/')).toEqual('/');
     });
 
     it('should parse empty path with padding', () => {
-      expect(normalizeUrl('    ')).toEqual('/');
+      expect(deepLinker.normalizeUrl('    ')).toEqual('/');
     });
 
     it('should parse empty path', () => {
-      expect(normalizeUrl('')).toEqual('/');
+      expect(deepLinker.normalizeUrl('')).toEqual('/');
+    });
+
+  });
+
+  describe('navChange', () => {
+    it('should immediately return when an active nav container is a tabs component', () => {
+      linker._app.getActiveNavContainers = () => {
+        return [mockTabs()];
+      };
+
+      spyOn(linker, 'getSegmentsFromNav');
+
+      linker.navChange('forward');
+
+      expect(linker.getSegmentsFromNav).not.toHaveBeenCalled();
+    });
+
+    it('should immediately return when an active nav container is transitioning', () => {
+      const mockNav = mockNavController();
+      mockNav.setTransitioning(true);
+      linker._app.getActiveNavContainers = () => {
+        return [mockNav];
+      };
+
+      spyOn(linker, 'getSegmentsFromNav');
+
+      linker.navChange('forward');
+
+      expect(linker.getSegmentsFromNav).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('getSegmentFromNav', () => {
+    it('should use the name of the nav when it exists', () => {
+      const mockNav = mockNavController();
+      mockNav.name = 'superduper';
+      const view1 = mockView(MockView1);
+      mockViews(mockNav, [view1]);
+
+      const spy = spyOn(serializer, 'serializeComponent');
+
+      linker.getSegmentFromNav(mockNav, null, null);
+
+      expect(spy.calls.first().args[0]).toEqual(mockNav);
+    });
+
+    it('should use the id of the nav when name doesnt exists', () => {
+      const mockNav = mockNavController();
+      mockNav.id = 'someId';
+      const view1 = mockView(MockView1);
+      mockViews(mockNav, [view1]);
+
+      const spy = spyOn(serializer, 'serializeComponent');
+
+      linker.getSegmentFromNav(mockNav, null, null);
+
+      expect(spy.calls.first().args[0]).toEqual(mockNav);
+    });
+  });
+
+  describe('getSegmentFromTab', () => {
+    it('should use the parent tabs name when it exists', () => {
+      const tabs = mockTabs();
+      tabs.name = 'super-tabs';
+      const tabOne = mockTab(tabs);
+      tabOne.setSelected(true);
+      mockTab(tabs);
+
+      tabs.select(tabOne);
+
+      const spy = spyOn(serializer, 'serializeComponent');
+
+      linker.getSegmentFromTab(tabOne, null, null);
+
+      expect(spy).toHaveBeenCalled();
+      expect(spy.calls.first().args[0]).toEqual(tabs);
+
+    });
+
+    it('should use the parent tabs id when name doesnt exists', () => {
+      const tabs = mockTabs();
+      tabs.id = 'super-tabs';
+      const tabOne = mockTab(tabs);
+      tabOne.setSelected(true);
+      mockTab(tabs);
+
+      tabs.select(tabOne);
+
+      const spy = spyOn(serializer, 'serializeComponent');
+
+      linker.getSegmentFromTab(tabOne, null, null);
+
+      expect(spy).toHaveBeenCalled();
+      expect(spy.calls.first().args[0]).toEqual(tabs);
+
+    });
+  });
+
+  describe('_loadViewForSegment', () => {
+    it('should call done if segment is null', () => {
+      const wrapper = {
+        done: () => {}
+      };
+      spyOn(wrapper, wrapper.done.name);
+
+      linker._loadViewForSegment(null, null, wrapper.done);
+
+      expect(wrapper.done).toHaveBeenCalled();
+    });
+
+    it('should set the selected tab from the segment', () => {
+      const wrapper = {
+        done: () => {}
+      };
+      spyOn(wrapper, wrapper.done.name);
+
+      const tabs = mockTabs();
+      const tabOne = mockTab(tabs);
+      tabOne.parent = tabs;
+      mockTab(tabs);
+
+      const segment: NavSegment = {
+        id: 'someId',
+        type: 'tab',
+        navId: tabOne.id,
+        secondaryId: 'secondaryId',
+        name: 'name',
+        data: { }
+      };
+
+      spyOn(tabs, '_getSelectedTabIndex').and.returnValue(0);
+      const selectSpy = spyOn(tabs, 'select');
+
+      linker._loadViewForSegment(tabs, segment, wrapper.done);
+
+      expect(selectSpy.calls.first().args[0]).toEqual(tabOne);
+      expect(selectSpy.calls.first().args[0]._lazyRootFromUrl).toEqual(segment.name);
+      expect(selectSpy.calls.first().args[0]._lazyRootFromUrlData).toEqual(segment.data);
+      expect(wrapper.done).toHaveBeenCalled();
+    });
+
+    it('should remain on the last view in the stack if its found', () => {
+      const wrapper = {
+        done: () => {}
+      };
+      spyOn(wrapper, wrapper.done.name);
+
+      const navCtrl = mockNavController();
+      const view1 = mockView(MockView1);
+      view1.id = 'MockPage1';
+      const view2 = mockView(MockView1);
+      view2.id = 'MockPage2';
+
+      mockViews(navCtrl, [view1, view2]);
+
+      spyOn(navCtrl, 'popTo');
+      spyOn(navCtrl, 'setRoot');
+
+      const segment: NavSegment = {
+        id: view2.id,
+        type: 'nav',
+        navId: view2.id,
+        secondaryId: null,
+        name: 'name',
+        data: { }
+      };
+
+      linker._loadViewForSegment(navCtrl, segment, wrapper.done);
+
+      expect(wrapper.done).toHaveBeenCalled();
+      expect(navCtrl.popTo).not.toHaveBeenCalled();
+      expect(navCtrl.setRoot).not.toHaveBeenCalled();
+    });
+
+    it('should popTo the view if its in the stack', () => {
+      const wrapper = {
+        done: () => {}
+      };
+      spyOn(wrapper, wrapper.done.name);
+
+      const navCtrl = mockNavController();
+      const view1 = mockView(MockView1);
+      view1.id = 'MockPage1';
+      const view2 = mockView(MockView1);
+      view2.id = 'MockPage2';
+
+      mockViews(navCtrl, [view1, view2]);
+
+      spyOn(navCtrl, 'popTo');
+      spyOn(navCtrl, 'setRoot');
+
+      const segment: NavSegment = {
+        id: view1.id,
+        type: 'nav',
+        navId: view1.id,
+        secondaryId: null,
+        name: 'name',
+        data: { }
+      };
+
+      linker._loadViewForSegment(navCtrl, segment, wrapper.done);
+
+      expect(wrapper.done).not.toHaveBeenCalled();
+      expect(navCtrl.popTo).toHaveBeenCalled();
+      expect(navCtrl.setRoot).not.toHaveBeenCalled();
+    });
+
+    it('should set the component to root if a view controller doesnt yet exist', () => {
+      const wrapper = {
+        done: () => {}
+      };
+      spyOn(wrapper, wrapper.done.name);
+
+      const navCtrl = mockNavController();
+
+      spyOn(navCtrl, 'popTo');
+      const setRootSpy = spyOn(navCtrl, 'setRoot');
+
+      const segment: NavSegment = {
+        id: 'who cares',
+        type: 'nav',
+        navId: 'irrelevant data',
+        secondaryId: null,
+        name: 'name',
+        data: { }
+      };
+
+      linker._loadViewForSegment(navCtrl, segment, wrapper.done);
+
+      expect(wrapper.done).not.toHaveBeenCalled();
+      expect(navCtrl.popTo).not.toHaveBeenCalled();
+      expect(setRootSpy.calls.first().args[0]).toEqual(segment.name);
+      expect(setRootSpy.calls.first().args[1]).toEqual(segment.data);
     });
+  });
 
+  describe('createUrl', () => {
+    it('should get the current segments, then replace with whatever data needed, and then create a url from that', () => {
+      const name = 'Some Name';
+      const nav = mockNavController();
+      const mockSegment = { };
+      const existingSegments = [];
+      existingSegments.push({
+        navId: nav.id
+      });
+      existingSegments.push({
+        navId: 'blah'
+      });
+      const url = 'someUrl';
+      spyOn(serializer, 'createSegmentFromName').and.returnValue(mockSegment);
+      const serializeSpy = spyOn(serializer, 'serialize');
+      spyOn(linker, 'getCurrentSegments').and.returnValue(existingSegments);
+      spyOn(linker._location, 'prepareExternalUrl').and.returnValue(url);
+
+      const result = linker.createUrl(nav, name, null);
+      expect(result).toEqual(url);
+      expect(serializer.createSegmentFromName).toHaveBeenCalledWith(nav, name);
+      expect(serializeSpy.calls.first().args[0][0]).toEqual(mockSegment);
+      expect(serializeSpy.calls.first().args[0][1]).toEqual(existingSegments[1]);
+    });
   });
 
-  var linker: DeepLinker;
+  var linker: deepLinker.DeepLinker;
   var serializer: UrlSerializer;
 
   beforeEach(() => {
     let linkConfig = mockDeepLinkConfig();
-    serializer = new UrlSerializer(linkConfig);
+    serializer = new UrlSerializer(mockApp(), linkConfig);
 
     let moduleLoader = mockModuleLoader();
     let baseCfr: any = null;
 
-    linker = new DeepLinker(mockApp(), serializer, mockLocation(), moduleLoader as any, baseCfr);
+    linker = new deepLinker.DeepLinker(mockApp(), serializer, mockLocation(), moduleLoader as any, baseCfr);
   });
 
 });
diff --git a/src/navigation/test/nav-controller.spec.ts b/src/navigation/test/nav-controller.spec.ts
index 59f897c5f1c..3d32cfd63bc 100644
--- a/src/navigation/test/nav-controller.spec.ts
+++ b/src/navigation/test/nav-controller.spec.ts
@@ -1,7 +1,15 @@
-import { mockNavController, mockView, mockViews,
-         MockView1, MockView2, MockView3, MockView4, MockView5 } from '../../util/mock-providers';
+import {
+  MockView1,
+  MockView2,
+  MockView3,
+  MockView4,
+  MockView5,
+  mockNavController,
+  mockView,
+  mockViews
+} from '../../util/mock-providers';
 import { NavControllerBase } from '../nav-controller-base';
-import { NavOptions, DIRECTION_FORWARD, DIRECTION_BACK } from '../nav-util';
+import { DIRECTION_BACK, DIRECTION_FORWARD, NavOptions,  } from '../nav-util';
 import { ViewController } from '../view-controller';
 
 
@@ -1091,16 +1099,62 @@ describe('NavController', () => {
 
     it('should not crash when destroyed while transitioning', (done) => {
       let view1 = mockView(MockView1);
-      nav.push(view1).then(() => {
-        fail('it should not succeed');
+      nav.push(view1).then((succeded: boolean) => {
+        expect(succeded).toEqual(false);
         done();
-      }).catch((err: any) => {
-        expect(err).toEqual('nav controller was destroyed');
+      }).catch(() => {
+        fail('should never get here');
         done();
-        });
+      });
       nav.destroy();
     }, 10000);
+  });
+
+  describe('canSwipeBack', () => {
+    it('should not swipe back when its not enabled', () => {
+      nav._sbEnabled = false;
+
+      const view1 = mockView();
+      const view2 = mockView();
+      mockViews(nav, [view1, view2]);
+
+      const result = nav.canSwipeBack();
+      expect(result).toEqual(false);
+    });
+
+    it('should not swipe back if its the portal', () => {
+      nav._sbEnabled = true;
+      nav._isPortal = true;
+
+      const view1 = mockView();
+      const view2 = mockView();
+      mockViews(nav, [view1, view2]);
+
+      const result = nav.canSwipeBack();
+      expect(result).toEqual(false);
+    });
+
+    it('should not swipe back if it has a child nav', () => {
+      nav._sbEnabled = true;
+      nav.registerChildNav(mockNavController());
+
+      const view1 = mockView();
+      const view2 = mockView();
+      mockViews(nav, [view1, view2]);
 
+      const result = nav.canSwipeBack();
+      expect(result).toEqual(false);
+    });
+
+    it('should swipe back when has a view to go back to', () => {
+      nav._sbEnabled = true;
+      const view1 = mockView();
+      const view2 = mockView();
+      mockViews(nav, [view1, view2]);
+
+      const result = nav.canSwipeBack();
+      expect(result).toEqual(true);
+    });
   });
 
 
diff --git a/src/navigation/test/nav-util.spec.ts b/src/navigation/test/nav-util.spec.ts
index 0f2bd71c81c..fe353e7d770 100644
--- a/src/navigation/test/nav-util.spec.ts
+++ b/src/navigation/test/nav-util.spec.ts
@@ -1,5 +1,5 @@
-import { convertToView, convertToViews, DIRECTION_BACK, DIRECTION_FORWARD, setZIndex } from '../nav-util';
-import { mockDeepLinker, mockNavController, MockView, mockRenderer, mockView, mockViews } from '../../util/mock-providers';
+import { DIRECTION_BACK, DIRECTION_FORWARD, convertToView, convertToViews, setZIndex } from '../nav-util';
+import { MockView, mockDeepLinker, mockNavController, mockRenderer, mockView, mockViews } from '../../util/mock-providers';
 import { ViewController } from '../view-controller';
 
 
diff --git a/src/navigation/test/url-serializer.spec.ts b/src/navigation/test/url-serializer.spec.ts
index 014ac03e5c5..064054f5293 100644
--- a/src/navigation/test/url-serializer.spec.ts
+++ b/src/navigation/test/url-serializer.spec.ts
@@ -1,42 +1,58 @@
 import { NavLink, NavSegment } from '../nav-util';
-import { UrlSerializer, isPartMatch, fillMatchedUrlParts, parseUrlParts, createMatchedData, normalizeLinks, findLinkByComponentData } from '../url-serializer';
-import { mockDeepLinkConfig, noop, MockView1, MockView2, MockView3, MockView4, MockView5 } from '../../util/mock-providers';
+import {
+  UrlSerializer,
+  convertUrlToDehydratedSegments,
+  convertUrlToSegments,
+  createMatchedData,
+  findLinkByComponentData,
+  formatUrlPart,
+  isPartMatch,
+  navGroupStringtoObjects,
+  normalizeLinks,
+  urlToNavGroupStrings,
+  } from '../url-serializer';
+import { MockView1, MockView2, MockView3, mockApp, mockDeepLinkConfig, mockNavController, mockTab, mockTabs, noop } from '../../util/mock-providers';
 
 
 describe('UrlSerializer', () => {
 
   describe('serializeComponent', () => {
 
-    it('should create segement when config has multiple links to same component', () => {
+    it('should create segment when config has multiple links to same component', () => {
       const link1 = { component: MockView1, name: 'viewone', segment: 'view' };
       const link2 = { component: MockView1, name: 'viewtwo', segment: 'view/:param1' };
       const link3 = { component: MockView1, name: 'viewthree', segment: 'view/:param1/:param2' };
-
       serializer = mockSerializer([link1, link2, link3]);
       serializer._createSegment = noop;
       spyOn(serializer, '_createSegment');
-      serializer.serializeComponent(MockView1, null);
-      expect(serializer._createSegment).toHaveBeenCalledWith(link1, null);
+      const nav = mockNavController();
+      serializer.serializeComponent(nav, MockView1, null);
+      expect(serializer._createSegment).toHaveBeenCalledWith(serializer._app, nav, link1, null);
     });
 
     it('should create segment if component found in links', () => {
       serializer._createSegment = noop;
       spyOn(serializer, '_createSegment');
-      serializer.serializeComponent(MockView1, null);
+      const nav = mockNavController();
+      serializer.serializeComponent(nav, MockView1, null);
       expect(serializer._createSegment).toHaveBeenCalled();
     });
 
     it('should return null if component not found in links', () => {
       serializer._createSegment = noop;
       spyOn(serializer, '_createSegment');
-      serializer.serializeComponent(NotFound, null);
+      const nav = mockNavController();
+      serializer.serializeComponent(nav, NotFound, null);
       expect(serializer._createSegment).not.toHaveBeenCalled();
     });
 
     it('should create tab segment if component found in deep links', () => {
       serializer._createSegment = noop;
       spyOn(serializer, '_createSegment');
-      serializer.serializeComponent(MockView1, null);
+
+      const tabs = mockTabs();
+      const tab = mockTab(tabs);
+      serializer.serializeComponent(tab, MockView1, null);
       expect(serializer._createSegment).toHaveBeenCalled();
     });
 
@@ -45,472 +61,203 @@ describe('UrlSerializer', () => {
   describe('_createSegment', () => {
 
     it('should create segement path data', () => {
-      let link: NavLink = {
-        parts: ['a', ':id', ':name'],
+      const link: NavLink = {
+        segmentParts: ['userId', ':id', 'name', ':name'],
         component: MockView1
       };
-      let data: any = {
+      const data = {
         id: 8675309,
         name: 'jenny'
       };
-      let p = serializer._createSegment(link, data);
-      expect(p.id).toEqual('a/8675309/jenny');
-      expect(p.component).toEqual(MockView1);
+
+      const nav = mockNavController();
+      const segment = serializer._createSegment(serializer._app, nav, link, data);
+      expect(segment.id).toEqual('userId/8675309/name/jenny');
+      expect(segment.component).toEqual(link.component);
+      expect(segment.data.id).toEqual(data.id);
+      expect(segment.data.name).toEqual(data.name);
     });
 
     it('should create segement with encodeURIComponent data', () => {
-      let char = '道';
-      let encoded = encodeURIComponent(char);
+      const char = '道';
+      const encoded = encodeURIComponent(char);
 
-      let link: NavLink = {
-        parts: ['a', ':id'],
+      const link: NavLink = {
+        segmentParts: ['userId', ':id', 'name', ':name'],
         component: MockView1
       };
-      let data: any = {
-        id: char
+      const data: any = {
+        id: char,
+        name: 'jenny'
       };
-      let p = serializer._createSegment(link, data);
-      expect(p.id).toEqual('a/' + encoded);
-      expect(p.component).toEqual(MockView1);
-      expect(p.data.id).toEqual(char);
+      const nav = mockNavController();
+      const segment = serializer._createSegment(serializer._app, nav, link, data);
+      expect(segment.id).toEqual(`userId/${encoded}/name/${data.name}`);
+      expect(segment.component).toEqual(MockView1);
+      expect(segment.data.id).toEqual(char);
     });
 
     it('should create segement with no data', () => {
-      let link: NavLink = {
-        parts: ['a'],
+      const link: NavLink = {
+        segmentParts: ['settings-view'],
         component: MockView1
       };
-      let p = serializer._createSegment(link, null);
-      expect(p.id).toEqual('a');
-      expect(p.component).toEqual(MockView1);
-      expect(p.data).toEqual(null);
+      const nav = mockNavController();
+      const segment = serializer._createSegment(serializer._app, nav, link, null);
+      expect(segment.id).toEqual('settings-view');
+      expect(segment.component).toEqual(MockView1);
+      expect(segment.data).toEqual(null);
     });
 
   });
 
-  describe('parse', () => {
-
-    it('should parse mix match of component paths', () => {
-      serializer = mockSerializer([
-        { segment: 'b/c', name: 'viewone', component: MockView1 },
-        { segment: 'a/:id', name: 'viewtwo', component: MockView2 }
-      ]);
-      let p = serializer.parse('a/b/c');
-      expect(p.length).toEqual(2);
-      expect(p[0].component).toEqual(null);
-      expect(p[0].data).toEqual(null);
-      expect(p[1].name).toEqual('viewone');
-      expect(p[1].data).toEqual(null);
-    });
-
-    it('should parse by higher priority with data in middle', () => {
-      serializer = mockSerializer([
-        { segment: 'viewone/:id/viewtwo', name: 'viewone', component: MockView1 },
-        { segment: 'viewone/viewtwo', name: 'viewtwo', component: MockView2 },
-        { segment: 'viewtwo', name: 'viewthree', component: MockView3 }
-      ]);
-      let p = serializer.parse('viewone/viewtwo/viewtwo');
-      expect(p.length).toEqual(1);
-      expect(p[0].name).toEqual('viewone');
-      expect(p[0].data.id).toEqual('viewtwo');
-    });
-
-    it('should parse by higher priority, two segments', () => {
-      serializer = mockSerializer([
-        { segment: 'viewone/:id', name: 'viewone', component: MockView1 },
-        { name: 'viewtwo', component: MockView2 }
-      ]);
-      let p = serializer.parse('viewone/viewtwo');
-      expect(p.length).toEqual(1);
-      expect(p[0].name).toEqual('viewone');
-      expect(p[0].data.id).toEqual('viewtwo');
-    });
-
-    it('should parse path with one slash and data', () => {
-      serializer = mockSerializer([
-        { segment: 'a/:id', name: 'a', component: MockView1 },
-      ]);
-      let p = serializer.parse('a/b');
-      expect(p.length).toEqual(1);
-      expect(p[0].name).toEqual('a');
-      expect(p[0].data.id).toEqual('b');
-    });
-
-    it('should parse multiple url part path', () => {
-      serializer = mockSerializer([
-        { segment: 'c/a/b/d', name: 'five', component: MockView5 },
-        { segment: 'c/a/b', name: 'four', component: MockView4 },
-        { segment: 'a/b/c', name: 'three', component: MockView3 },
-        { segment: 'a/b', name: 'two', component: MockView2 },
-        { segment: 'a', name: 'one', component: MockView1 }
-      ]);
-      let p = serializer.parse('a/b');
-      expect(p.length).toEqual(1);
-      expect(p[0].name).toEqual('two');
-
-      p = serializer.parse('a');
-      expect(p.length).toEqual(1);
-      expect(p[0].name).toEqual('one');
-    });
-
-    it('should parse multiple segments with data', () => {
-      let p = serializer.parse('viewone/viewtwo');
-      expect(p.length).toEqual(2);
-      expect(p[0].name).toEqual('viewone');
-      expect(p[1].name).toEqual('viewtwo');
-    });
-
-    it('should parse one segment path', () => {
-      let p = serializer.parse('viewone');
-      expect(p.length).toEqual(1);
-      expect(p[0].id).toEqual('viewone');
-      expect(p[0].name).toEqual('viewone');
-      expect(p[0].data).toEqual(null);
-    });
-
-    describe('serialize', () => {
-
-      it('should bring together two paths that are not the index', () => {
-        let path: NavSegment[] = [
-          { id: 'a', name: 'a', component: MockView1, data: null },
-          { id: 'b', name: 'b', component: MockView1, data: null }
-        ];
-        expect(serializer.serialize(path)).toEqual('/a/b');
-      });
-
-      it('should bring together one path, not the index', () => {
-        let path: NavSegment[] = [
-          { id: 'a', name: 'a', component: MockView1, data: null }
-        ];
-        expect(serializer.serialize(path)).toEqual('/a');
-      });
-
-      it('should bring together one path that is the index', () => {
-        let path: NavSegment[] = [
-          { id: '', name: 'a', component: MockView1, data: null }
-        ];
-        expect(serializer.serialize(path)).toEqual('/');
-      });
-
+  describe('navGroupStringtoObjects', () => {
+    it('should convert the nav group strings to objects', () => {
+      const urlChunks = ['taco/burrito/pizza/nachos', 'nav/1/chunk/of/segment', 'tabs/1/tab-one/chunk/of/segment', 'schedule', 'taco/burrito'];
+      const objects = navGroupStringtoObjects(urlChunks);
+      expect(objects.length).toEqual(5);
+      expect(objects[0].type).toEqual(null);
+      expect(objects[0].navId).toEqual(null);
+      expect(objects[0].secondaryId).toEqual(null);
+      expect(objects[0].segmentPieces.length).toEqual(4);
+      expect(objects[0].segmentPieces[0]).toEqual('taco');
+      expect(objects[0].segmentPieces[1]).toEqual('burrito');
+      expect(objects[0].segmentPieces[2]).toEqual('pizza');
+      expect(objects[0].segmentPieces[3]).toEqual('nachos');
+      expect(objects[1].type).toEqual('nav');
+      expect(objects[1].navId).toEqual('1');
+      expect(objects[1].secondaryId).toEqual(null);
+      expect(objects[1].segmentPieces.length).toEqual(3);
+      expect(objects[1].segmentPieces[0]).toEqual('chunk');
+      expect(objects[1].segmentPieces[1]).toEqual('of');
+      expect(objects[1].segmentPieces[2]).toEqual('segment');
+      expect(objects[2].type).toEqual('tabs');
+      expect(objects[2].navId).toEqual('1');
+      expect(objects[2].secondaryId).toEqual('tab-one');
+      expect(objects[2].segmentPieces.length).toEqual(3);
+      expect(objects[2].segmentPieces[0]).toEqual('chunk');
+      expect(objects[2].segmentPieces[1]).toEqual('of');
+      expect(objects[2].segmentPieces[2]).toEqual('segment');
+
+      expect(objects[3].type).toEqual(null);
+      expect(objects[3].navId).toEqual(null);
+      expect(objects[3].secondaryId).toEqual(null);
+      expect(objects[3].segmentPieces.length).toEqual(1);
+      expect(objects[3].segmentPieces[0]).toEqual('schedule');
+
+      expect(objects[4].type).toEqual(null);
+      expect(objects[4].navId).toEqual(null);
+      expect(objects[4].secondaryId).toEqual(null);
+      expect(objects[4].segmentPieces.length).toEqual(2);
+      expect(objects[4].segmentPieces[0]).toEqual('taco');
+      expect(objects[4].segmentPieces[1]).toEqual('burrito');
     });
+  });
 
-    describe('createMatchedData', () => {
-
-      it('should get data from multiple parts', () => {
-        let matchedUrlParts = ['a', 'ellie', 'blacklab'];
-        let link: NavLink = {
-          parts: ['a', ':name', ':breed'], partsLen: 3, component: MockView1
-        };
-        let data = createMatchedData(matchedUrlParts, link);
-        expect(data.name).toEqual('ellie');
-        expect(data.breed).toEqual('blacklab');
-      });
-
-      it('should get data within the config link path', () => {
-        let char = '道';
-
-        let matchedUrlParts = ['a', 'b', encodeURIComponent(char), 'd'];
-        let link: NavLink = {
-          parts: ['a', ':id', ':name', 'd'], partsLen: 4, component: MockView1
-        };
-        let data = createMatchedData(matchedUrlParts, link);
-        expect(data.id).toEqual('b');
-        expect(data.name).toEqual(char);
-      });
-
-      it('should get data within the config link path', () => {
-        let matchedUrlParts = ['a', '8675309'];
-        let link: NavLink = {
-          parts: ['a', ':num'], partsLen: 2, component: MockView1
-        };
-        let data = createMatchedData(matchedUrlParts, link);
-        expect(data.num).toEqual('8675309');
-      });
-
-      it('should get uri decode data', () => {
-        let char = '道';
-
-        let matchedUrlParts = [`${encodeURIComponent(char)}`];
-        let link: NavLink = {
-          parts: [':name'], partsLen: 1, component: MockView1
-        };
-        let data = createMatchedData(matchedUrlParts, link);
-        expect(data.name).toEqual(char);
-      });
-
-      it('should get null data if nothing in the url', () => {
-        let matchedUrlParts = ['a'];
-        let link: NavLink = {
-          parts: ['a'], partsLen: 1, component: MockView1
-        };
-        let data = createMatchedData(matchedUrlParts, link);
-        expect(data).toEqual(null);
-      });
-
+  describe('serialize', () => {
+    it('should serialize multiple segments into a url with explicit prefixs', () => {
+      let paths: NavSegment[] = [
+        { type: 'nav', navId: 'whatup', secondaryId: null, id: 'some/url/chunks', name: 'viewOne', component: MockView1, data: null, requiresExplicitNavPrefix: true},
+        { type: 'tabs', navId: 't1', secondaryId: 'tab-one', id: 'some/more/url/chunks', name: 'viewTwo', component: MockView1, data: null, requiresExplicitNavPrefix: true }
+      ];
+      const result = serializer.serialize(paths);
+      expect(result).toEqual('/nav/whatup/some/url/chunks/tabs/t1/tab-one/some/more/url/chunks');
     });
 
-    describe('parseUrlParts', () => {
-
-      it('should match with complex path', () => {
-        let urlParts = ['a', 'b', 'c', 'd', 'e', 'f', 'g'];
-        let configLinks: NavLink[] = [
-          { parts: ['a', 'b', 'c', 'e'], partsLen: 4, component: MockView2 },
-          { parts: ['a', ':key', ':val'], partsLen: 3, component: MockView1 },
-          { parts: ['a', 'c', 'd'], partsLen: 3, component: MockView5 },
-          { parts: ['d', 'e'], partsLen: 2, component: MockView4 },
-          { parts: ['d', ':x'], partsLen: 2, component: MockView3 },
-          { parts: ['f'], partsLen: 1, component: MockView2 },
-          { parts: [':last'], partsLen: 1, component: MockView1 },
-        ];
-
-        let segments = parseUrlParts(urlParts, configLinks);
-        expect(segments.length).toEqual(4);
-        expect(segments[0].id).toEqual('a/b/c');
-        expect(segments[0].data.key).toEqual('b');
-        expect(segments[0].data.val).toEqual('c');
-        expect(segments[1].id).toEqual('d/e');
-        expect(segments[1].data).toEqual(null);
-        expect(segments[2].id).toEqual('f');
-        expect(segments[3].id).toEqual('g');
-        expect(segments[3].data.last).toEqual('g');
-      });
-
-      it('should not get a match on already matched parts', () => {
-        let urlParts = ['a', 'b', 'c', 'd', 'e', 'f', 'g'];
-        let configLinks: NavLink[] = [
-          { parts: ['a', 'b', 'c'], partsLen: 3, component: MockView1 },
-          { parts: ['b', 'c', 'd'], partsLen: 3, component: MockView1 }, // no match
-          { parts: ['a', 'b'], partsLen: 2, component: MockView1 }, // no match
-          { parts: ['d', 'e'], partsLen: 2, component: MockView1 },
-          { parts: ['e', 'f'], partsLen: 2, component: MockView1 }, // no match
-          { parts: ['e'], partsLen: 1, component: MockView1 }, // no match
-          { parts: ['f'], partsLen: 1, component: MockView1 },
-        ];
-
-        let segments = parseUrlParts(urlParts, configLinks);
-        expect(segments.length).toEqual(4);
-        expect(segments[0].id).toEqual('a/b/c');
-        expect(segments[1].id).toEqual('d/e');
-        expect(segments[2].id).toEqual('f');
-        expect(segments[3].id).toEqual('g');
-      });
-
-      it('should get a one part match', () => {
-        let urlParts = ['a', 'b', 'c'];
-        let configLinks: NavLink[] = [
-          { parts: ['a'], partsLen: 1, component: MockView1 },
-          { parts: ['b'], partsLen: 1, component: MockView2 },
-          { parts: ['c'], partsLen: 1, component: MockView3 },
-        ];
-        let segments = parseUrlParts(urlParts, configLinks);
-        expect(segments.length).toEqual(3);
-        expect(segments[0].id).toEqual('a');
-        expect(segments[1].id).toEqual('b');
-        expect(segments[2].id).toEqual('c');
-      });
-
-      it('should not match', () => {
-        let urlParts = ['z'];
-        let configLinks: NavLink[] = [
-          { parts: ['a'], partsLen: 1, component: MockView1 }
-        ];
-        let segments = parseUrlParts(urlParts, configLinks);
-        expect(segments.length).toEqual(1);
-        expect(segments[0].id).toEqual('z');
-        expect(segments[0].name).toEqual('z');
-        expect(segments[0].component).toEqual(null);
-        expect(segments[0].data).toEqual(null);
-      });
-
+    it('should serialize multiple segments into a url', () => {
+      let paths: NavSegment[] = [
+        { type: 'nav', navId: 'whatup', secondaryId: null, id: 'some/url/chunks', name: 'viewOne', component: MockView1, data: null },
+        { type: 'tabs', navId: 't1', secondaryId: 'tab-one', id: 'some/more/url/chunks', name: 'viewTwo', component: MockView1, data: null }
+      ];
+      const result = serializer.serialize(paths);
+      expect(result).toEqual('/some/url/chunks/tab-one/some/more/url/chunks');
     });
 
-    describe('fillMatchedUrlParts', () => {
-
-      it('should match w/ many url parts and many config parts w/ : data', () => {
-        let urlParts = ['a', 'b', 'c', 'd', 'e', 'b', 'c'];
-        let configLink: NavLink = { parts: ['b', 'c', ':key'], partsLen: 3, component: MockView1 };
-        let segments: NavSegment[] = new Array(urlParts.length);
-        fillMatchedUrlParts(segments, urlParts, configLink);
-
-        expect(segments[0]).toEqual(undefined);
-        expect(segments[1].id).toEqual('b/c/d');
-        expect(segments[1].data.key).toEqual('d');
-
-        expect(urlParts[0]).toEqual('a');
-        expect(urlParts[1]).toEqual(undefined);
-        expect(urlParts[2]).toEqual(undefined);
-        expect(urlParts[3]).toEqual(undefined);
-        expect(urlParts[4]).toEqual('e');
-        expect(urlParts[5]).toEqual('b');
-        expect(urlParts[6]).toEqual('c');
-      });
-
-      it('should not match w/ many url parts and many config parts', () => {
-        let urlParts = ['a', 'b', 'c', 'd', 'e', 'f', 'g'];
-        let configLink: NavLink = { parts: ['e', 'c', 'd'], partsLen: 3, component: MockView1 };
-        let segments: NavSegment[] = new Array(urlParts.length);
-        fillMatchedUrlParts(segments, urlParts, configLink);
-        expect(segments.filter(f => !!f).length).toEqual(0);
-
-        expect(urlParts[0]).toEqual('a');
-        expect(urlParts[1]).toEqual('b');
-        expect(urlParts[2]).toEqual('c');
-        expect(urlParts[3]).toEqual('d');
-        expect(urlParts[4]).toEqual('e');
-        expect(urlParts[5]).toEqual('f');
-        expect(urlParts[6]).toEqual('g');
-      });
-
-      it('should match w/ two sets of the same parts', () => {
-        let urlParts = ['a', 'b', 'c', 'd', 'b', 'c'];
-        let configLink: NavLink = { parts: ['b', 'c'], partsLen: 2, component: MockView1 };
-        let segments: NavSegment[] = new Array(urlParts.length);
-        fillMatchedUrlParts(segments, urlParts, configLink);
-
-        expect(segments[0]).toEqual(undefined);
-        expect(segments[1].id).toEqual('b/c');
-        expect(segments[2]).toEqual(undefined);
-        expect(segments[3]).toEqual(undefined);
-        expect(segments[4].id).toEqual('b/c');
-        expect(segments[5]).toEqual(undefined);
-
-        expect(urlParts[0]).toEqual('a');
-        expect(urlParts[1]).toEqual(undefined);
-        expect(urlParts[2]).toEqual(undefined);
-        expect(urlParts[3]).toEqual('d');
-        expect(urlParts[4]).toEqual(undefined);
-        expect(urlParts[5]).toEqual(undefined);
-      });
-
-      it('should match w/ many url parts and many config parts', () => {
-        let urlParts = ['a', 'b', 'c', 'd'];
-        let configLink: NavLink = { parts: ['c', 'd'], partsLen: 2, component: MockView1 };
-        let segments: NavSegment[] = new Array(urlParts.length);
-        fillMatchedUrlParts(segments, urlParts, configLink);
-
-        expect(segments[0]).toEqual(undefined);
-        expect(segments[1]).toEqual(undefined);
-        expect(segments[2].id).toEqual('c/d');
-        expect(segments[3]).toEqual(undefined);
-
-        expect(urlParts[0]).toEqual('a');
-        expect(urlParts[1]).toEqual('b');
-        expect(urlParts[2]).toEqual(undefined);
-        expect(urlParts[3]).toEqual(undefined);
-      });
-
-      it('should match the repeated url parts', () => {
-        let urlParts = ['a', 'a', 'a', 'a'];
-        let configLink: NavLink = { parts: ['a'], partsLen: 1, component: MockView1 };
-        let segments: NavSegment[] = new Array(urlParts.length);
-        fillMatchedUrlParts(segments, urlParts, configLink);
-
-        expect(segments[0].id).toEqual('a');
-        expect(segments[1].id).toEqual('a');
-        expect(segments[2].id).toEqual('a');
-        expect(segments[3].id).toEqual('a');
-
-        expect(urlParts[0]).toEqual(undefined);
-        expect(urlParts[1]).toEqual(undefined);
-        expect(urlParts[2]).toEqual(undefined);
-        expect(urlParts[3]).toEqual(undefined);
-      });
-
-      it('should not match w/ two url parts', () => {
-        let urlParts = ['a', 'b'];
-        let configLink: NavLink = { parts: ['c'], partsLen: 1, component: MockView1 };
-        let segments: NavSegment[] = new Array(urlParts.length);
-        fillMatchedUrlParts(segments, urlParts, configLink);
-
-        expect(segments[0]).toEqual(undefined);
-        expect(segments[1]).toEqual(undefined);
-
-        expect(urlParts[0]).toEqual('a');
-        expect(urlParts[1]).toEqual('b');
-      });
+    it('should return default url when given empty list of segments', () => {
+      expect(serializer.serialize([])).toEqual('/');
+    });
 
-      it('should match data only config link part', () => {
-        let urlParts = ['a', 'b'];
-        let configLink: NavLink = { parts: [':key'], partsLen: 1, component: MockView1 };
-        let segments: NavSegment[] = new Array(urlParts.length);
-        fillMatchedUrlParts(segments, urlParts, configLink);
+  });
 
-        expect(segments[0].id).toEqual('a');
-        expect(segments[0].data.key).toEqual('a');
-        expect(segments[1].id).toEqual('b');
-        expect(segments[1].data.key).toEqual('b');
+  describe('createMatchedData', () => {
 
-        expect(urlParts[0]).toEqual(undefined);
-        expect(urlParts[1]).toEqual(undefined);
-      });
+    it('should get data from multiple parts', () => {
+      let matchedUrlParts = ['a', 'ellie', 'blacklab'];
+      let link: NavLink = {
+        segmentParts: ['a', ':name', ':breed'], segmentPartsLen: 3, component: MockView1
+      };
+      let data = createMatchedData(matchedUrlParts, link);
+      expect(data.name).toEqual('ellie');
+      expect(data.breed).toEqual('blacklab');
+    });
 
-      it('should match w/ many url parts', () => {
-        let urlParts = ['a', 'b', 'c', 'd'];
-        let configLink: NavLink = { parts: ['d'], partsLen: 1, component: MockView1 };
-        let segments: NavSegment[] = new Array(urlParts.length);
-        fillMatchedUrlParts(segments, urlParts, configLink);
-
-        expect(segments[0]).toEqual(undefined);
-        expect(segments[1]).toEqual(undefined);
-        expect(segments[2]).toEqual(undefined);
-        expect(segments[3].id).toEqual('d');
-
-        expect(urlParts[0]).toEqual('a');
-        expect(urlParts[1]).toEqual('b');
-        expect(urlParts[2]).toEqual('c');
-        expect(urlParts[3]).toEqual(undefined);
-      });
+    it('should get data within the config link path', () => {
+      let char = '道';
 
-      it('should match single part', () => {
-        let urlParts = ['a'];
-        let configLink: NavLink = { parts: ['a'], partsLen: 1, component: MockView1 };
-        let segments: NavSegment[] = new Array(urlParts.length);
-        fillMatchedUrlParts(segments, urlParts, configLink);
+      let matchedUrlParts = ['a', 'b', encodeURIComponent(char), 'd'];
+      let link: NavLink = {
+        segmentParts: ['a', ':id', ':name', 'd'], segmentPartsLen: 4, component: MockView1
+      };
+      let data = createMatchedData(matchedUrlParts, link);
+      expect(data.id).toEqual('b');
+      expect(data.name).toEqual(char);
+    });
 
-        expect(segments[0].id).toEqual('a');
-        expect(segments[0].component).toEqual(MockView1);
-        expect(segments[0].data).toEqual(null);
+    it('should get data within the config link path', () => {
+      let matchedUrlParts = ['a', '8675309'];
+      let link: NavLink = {
+        segmentParts: ['a', ':num'], segmentPartsLen: 2, component: MockView1
+      };
+      let data = createMatchedData(matchedUrlParts, link);
+      expect(data.num).toEqual('8675309');
+    });
 
-        expect(urlParts[0]).toEqual(undefined);
-      });
+    it('should get uri decode data', () => {
+      let char = '道';
 
-      it('should not match single part', () => {
-        let urlParts = ['a'];
-        let configLink: NavLink = { parts: ['b'], partsLen: 1, component: MockView1 };
-        let segments: NavSegment[] = new Array(urlParts.length);
-        fillMatchedUrlParts(segments, urlParts, configLink);
-        expect(segments[0]).toEqual(undefined);
-        expect(urlParts[0]).toEqual('a');
-      });
+      let matchedUrlParts = [`${encodeURIComponent(char)}`];
+      let link: NavLink = {
+        segmentParts: [':name'], segmentPartsLen: 1, component: MockView1
+      };
+      let data = createMatchedData(matchedUrlParts, link);
+      expect(data.name).toEqual(char);
+    });
 
+    it('should get null data if nothing in the url', () => {
+      let matchedUrlParts = ['a'];
+      let link: NavLink = {
+        segmentParts: ['a'], segmentPartsLen: 1, component: MockView1
+      };
+      let data = createMatchedData(matchedUrlParts, link);
+      expect(data).toEqual(null);
     });
 
-    describe('isPartMatch', () => {
+  });
 
-      it('should match if parts are equal', () => {
-        expect(isPartMatch('a', 'a')).toEqual(true);
-      });
+  describe('isPartMatch', () => {
 
-      it('should not match if parts are not equal', () => {
-        expect(isPartMatch('a', 'b')).toEqual(false);
-      });
+    it('should match if parts are equal', () => {
+      expect(isPartMatch('a', 'a')).toEqual(true);
+    });
 
-      it('should not match if configLinkPart has a : thats not index 0', () => {
-        expect(isPartMatch('urlPart', 'my:id')).toEqual(false);
-      });
+    it('should not match if parts are not equal', () => {
+      expect(isPartMatch('a', 'b')).toEqual(false);
+    });
 
-      it('should match if configLinkPart starts with :', () => {
-        expect(isPartMatch('urlPart', ':id')).toEqual(true);
-      });
+    it('should not match if configLinkPart has a : thats not index 0', () => {
+      expect(isPartMatch('urlPart', 'my:id')).toEqual(false);
+    });
 
-      it('should not match an empty urlPart', () => {
-        expect(isPartMatch(null, 'configLinkPart')).toEqual(false);
-      });
+    it('should match if configLinkPart starts with :', () => {
+      expect(isPartMatch('urlPart', ':id')).toEqual(true);
+    });
 
-      it('should not match an empty configLinkPart', () => {
-        expect(isPartMatch('urlPart', null)).toEqual(false);
-      });
+    it('should not match an empty urlPart', () => {
+      expect(isPartMatch(null, 'configLinkPart')).toEqual(false);
+    });
 
+    it('should not match an empty configLinkPart', () => {
+      expect(isPartMatch('urlPart', null)).toEqual(false);
     });
 
   });
@@ -520,27 +267,27 @@ describe('UrlSerializer', () => {
     it('should encodeURIComponent', () => {
       let name = '你好';
       let encoded = encodeURIComponent(name);
-      expect(serializer.formatUrlPart(name)).toEqual(encoded);
+      expect(formatUrlPart(name)).toEqual(encoded);
     });
 
     it('should not allow restricted characters', () => {
-      expect(serializer.formatUrlPart('!!!Restricted \'?$,.+"*^|/\#%`><;:@&[]=! Characters!!!')).toEqual('restricted-characters');
+      expect(formatUrlPart('!!!Restricted \'?$,.+"*^|/\#%`><;:@&[]=! Characters!!!')).toEqual('restricted-characters');
     });
 
     it('should trim and replace spaces with dashes', () => {
-      expect(serializer.formatUrlPart('   This is the name   ')).toEqual('this-is-the-name');
+      expect(formatUrlPart('   This is the name   ')).toEqual('this-is-the-name');
     });
 
     it('should not have multiple dashes', () => {
-      expect(serializer.formatUrlPart('Contact Detail Page')).toEqual('contact-detail-page');
+      expect(formatUrlPart('Contact Detail Page')).toEqual('contact-detail-page');
     });
 
     it('should change to pascal case for multiple words', () => {
-      expect(serializer.formatUrlPart('ContactDetailPage')).toEqual('contact-detail-page');
+      expect(formatUrlPart('ContactDetailPage')).toEqual('contact-detail-page');
     });
 
     it('should change to pascal case for one work', () => {
-      expect(serializer.formatUrlPart('View1')).toEqual('view1');
+      expect(formatUrlPart('View1')).toEqual('view1');
     });
 
   });
@@ -690,7 +437,7 @@ describe('UrlSerializer', () => {
       let links: NavLink[] = [
         { name: 'somename', component: ContactDetailPage },
       ];
-      expect(normalizeLinks(links)[0].parts).toEqual(['somename']);
+      expect(normalizeLinks(links)[0].segmentParts).toEqual(['somename']);
     });
 
     it('should create path from name if path missing', () => {
@@ -704,6 +451,375 @@ describe('UrlSerializer', () => {
 
   });
 
+  describe('createSegmentFromName', () => {
+
+    it('should match by the links string name', () => {
+      const mockNav = mockNavController();
+      const segment = serializer.createSegmentFromName(mockNav, 'viewone');
+      expect(segment.component).toEqual(MockView1);
+      expect(segment.navId).toEqual(mockNav.id);
+    });
+
+    it('should get no match', () => {
+      const mockNav = mockNavController();
+      const segment = serializer.createSegmentFromName(mockNav, 'someObviouslyFakeNameNotFound');
+      expect(segment).toEqual(null);
+    });
+
+  });
+
+  describe('urlToNavGroupStrings', () => {
+    it('should get an array with a single piece url back', () => {
+      const url = 'test';
+      const result = urlToNavGroupStrings(url);
+      expect(result.length).toEqual(1);
+      expect(result[0]).toEqual('test');
+    });
+
+    it('should get an array with multiple pieces back', () => {
+      const url = 'the/dog/jumps/high';
+      const result = urlToNavGroupStrings(url);
+      expect(result.length).toEqual(1);
+      expect(result[0]).toEqual('the/dog/jumps/high');
+    });
+
+    it('should return a single entry with the nav prefix', () => {
+      const url = 'nav/myApp/the/dog/jumps/high';
+      const result = urlToNavGroupStrings(url);
+      expect(result.length).toEqual(1);
+      expect(result[0]).toEqual('nav/myApp/the/dog/jumps/high');
+    });
+
+    it('should return a single entry with the tabs prefix', () => {
+      const url = 'tabs/myApp/tab-one/the/dog/jumps/high';
+      const result = urlToNavGroupStrings(url);
+      expect(result.length).toEqual(1);
+      expect(result[0]).toEqual('tabs/myApp/tab-one/the/dog/jumps/high');
+    });
+
+    it('should return multiple entries with the nav prefix', () => {
+      const url = 'nav/myApp/the/dog/jumps/high/nav/someSubNav/taco/burrito/nav/thirdNav/banana/apple/orange';
+      const result = urlToNavGroupStrings(url);
+      expect(result.length).toEqual(3);
+      expect(result[0]).toEqual('nav/myApp/the/dog/jumps/high');
+      expect(result[1]).toEqual('nav/someSubNav/taco/burrito');
+      expect(result[2]).toEqual('nav/thirdNav/banana/apple/orange');
+    });
+
+    it('should return multiple entries with the tabs prefix', () => {
+      const url = 'tabs/myApp/tab-one/the/dog/jumps/high/tabs/someSubNav/tab-two/taco/burrito/tabs/thirdNav/tab-three/banana/apple/orange';
+      const result = urlToNavGroupStrings(url);
+      expect(result.length).toEqual(3);
+      expect(result[0]).toEqual('tabs/myApp/tab-one/the/dog/jumps/high');
+      expect(result[1]).toEqual('tabs/someSubNav/tab-two/taco/burrito');
+      expect(result[2]).toEqual('tabs/thirdNav/tab-three/banana/apple/orange');
+    });
+
+    it('should handle a nav in the middle of the url', () => {
+      const url = 'the/dog/jumps/high/nav/someSubNav/taco/burrito/nav/thirdNav/banana/apple/orange';
+      const result = urlToNavGroupStrings(url);
+      expect(result.length).toEqual(3);
+      expect(result[0]).toEqual('the/dog/jumps/high');
+      expect(result[1]).toEqual('nav/someSubNav/taco/burrito');
+      expect(result[2]).toEqual('nav/thirdNav/banana/apple/orange');
+    });
+
+    it('should handle a tabs in the middle of the url', () => {
+      const url = 'the/dog/jumps/high/tabs/someSubNav/tab-two/taco/burrito/tabs/thirdNav/tab-three/banana/apple/orange';
+      const result = urlToNavGroupStrings(url);
+      expect(result.length).toEqual(3);
+      expect(result[0]).toEqual('the/dog/jumps/high');
+      expect(result[1]).toEqual('tabs/someSubNav/tab-two/taco/burrito');
+      expect(result[2]).toEqual('tabs/thirdNav/tab-three/banana/apple/orange');
+    });
+
+    it('should handle a mixed url', () => {
+      const url = 'the/dog/jumps/high/tabs/someSubNav/tab-two/taco/burrito/nav/thirdNav/banana/apple/orange';
+      const result = urlToNavGroupStrings(url);
+      expect(result.length).toEqual(3);
+      expect(result[0]).toEqual('the/dog/jumps/high');
+      expect(result[1]).toEqual('tabs/someSubNav/tab-two/taco/burrito');
+      expect(result[2]).toEqual('nav/thirdNav/banana/apple/orange');
+    });
+  });
+
+  describe('convertUrlToDehydratedSegments', () => {
+    it('it should return a vanilla single segment', () => {
+      const link1 = { component: MockView1, name: 'viewone', segment: 'view-one' };
+      const link2 = { component: MockView1, name: 'viewtwo', segment: 'view-two' };
+      const link3 = { component: MockView1, name: 'viewthree', segment: 'view-three' };
+
+      const links = normalizeLinks([link1, link2, link3]);
+      const url = 'view-two';
+      const segmentPairs = convertUrlToDehydratedSegments(url, links);
+      expect(segmentPairs.length).toEqual(1);
+      expect(segmentPairs[0].segments.length).toEqual(1);
+      expect(segmentPairs[0].segments[0].id).toEqual('view-two');
+    });
+
+    it('it should return a data-driven single segment', () => {
+      const link1 = { component: MockView1, name: 'viewone', segment: 'view-one' };
+      const link2 = { component: MockView1, name: 'viewtwo', segment: 'view-two/paramOne/:paramOne/paramTwo/:paramTwo' };
+      const link3 = { component: MockView1, name: 'viewthree', segment: 'view-three' };
+
+      const links = normalizeLinks([link1, link2, link3]);
+      const url = 'view-two/paramOne/taco/paramTwo/burrito';
+      const segmentPairs = convertUrlToDehydratedSegments(url, links);
+      expect(segmentPairs.length).toEqual(1);
+      expect(segmentPairs[0].segments.length).toEqual(1);
+      expect(segmentPairs[0].segments[0].id).toEqual('view-two/paramOne/taco/paramTwo/burrito');
+      expect(segmentPairs[0].segments[0].data.paramOne).toEqual('taco');
+      expect(segmentPairs[0].segments[0].data.paramTwo).toEqual('burrito');
+    });
+
+    it('it should return a vanilla set of segments', () => {
+      const link1 = { component: MockView1, name: 'viewone', segment: 'view-one' };
+      const link2 = { component: MockView1, name: 'viewtwo', segment: 'view-two' };
+      const link3 = { component: MockView1, name: 'viewthree', segment: 'view-three' };
+      const link4 = { component: MockView1, name: 'viewfour', segment: 'view-four' };
+
+      const links = normalizeLinks([link1, link2, link3, link4]);
+      const url = 'view-two/view-one/view-three';
+      const segmentPairs = convertUrlToDehydratedSegments(url, links);
+      expect(segmentPairs.length).toEqual(1);
+      expect(segmentPairs[0].segments.length).toEqual(3);
+      expect(segmentPairs[0].segments[0].id).toEqual('view-two');
+      expect(segmentPairs[0].segments[1].id).toEqual('view-one');
+      expect(segmentPairs[0].segments[2].id).toEqual('view-three');
+    });
+
+    it('it should return a data-driven set of segments', () => {
+      const link1 = { component: MockView1, name: 'viewone', segment: 'view-one/paramOne/:paramOne/paramTwo/:paramTwo' };
+      const link2 = { component: MockView1, name: 'viewtwo', segment: 'view-two/user/:userId' };
+      const link3 = { component: MockView1, name: 'viewthree', segment: 'view-three/:itemId' };
+      const link4 = { component: MockView1, name: 'viewfour', segment: 'view-four' };
+
+      const links = normalizeLinks([link1, link2, link3, link4]);
+      const url = 'view-two/user/fred/view-one/paramOne/taco/paramTwo/burrito/view-three/12345';
+      const segmentPairs = convertUrlToDehydratedSegments(url, links);
+      expect(segmentPairs.length).toEqual(1);
+      expect(segmentPairs[0].segments.length).toEqual(3);
+      expect(segmentPairs[0].segments[0].id).toEqual('view-two/user/fred');
+      expect(segmentPairs[0].segments[0].data.userId).toEqual('fred');
+      expect(segmentPairs[0].segments[1].id).toEqual('view-one/paramOne/taco/paramTwo/burrito');
+      expect(segmentPairs[0].segments[1].data.paramOne).toEqual('taco');
+      expect(segmentPairs[0].segments[1].data.paramTwo).toEqual('burrito');
+      expect(segmentPairs[0].segments[2].id).toEqual('view-three/12345');
+      expect(segmentPairs[0].segments[2].data.itemId).toEqual('12345');
+    });
+
+    it('it should return a data-driven set of segments with a root nav prefix', () => {
+      const link1 = { component: MockView1, name: 'viewone', segment: 'view-one/paramOne/:paramOne/paramTwo/:paramTwo' };
+      const link2 = { component: MockView1, name: 'viewtwo', segment: 'view-two/user/:userId' };
+      const link3 = { component: MockView1, name: 'viewthree', segment: 'view-three/:itemId' };
+      const link4 = { component: MockView1, name: 'viewfour', segment: 'view-four' };
+
+      const links = normalizeLinks([link1, link2, link3, link4]);
+      const url = 'nav/123/view-two/user/fred/view-one/paramOne/taco/paramTwo/burrito/view-three/12345';
+      const segmentPairs = convertUrlToDehydratedSegments(url, links);
+      expect(segmentPairs.length).toEqual(1);
+      expect(segmentPairs[0].segments.length).toEqual(3);
+      expect(segmentPairs[0].segments[0].id).toEqual('view-two/user/fred');
+      expect(segmentPairs[0].segments[0].data.userId).toEqual('fred');
+      expect(segmentPairs[0].segments[1].id).toEqual('view-one/paramOne/taco/paramTwo/burrito');
+      expect(segmentPairs[0].segments[1].data.paramOne).toEqual('taco');
+      expect(segmentPairs[0].segments[1].data.paramTwo).toEqual('burrito');
+      expect(segmentPairs[0].segments[2].id).toEqual('view-three/12345');
+      expect(segmentPairs[0].segments[2].data.itemId).toEqual('12345');
+    });
+
+    it('it should return a data-driven set of segments with multiple nav segments in the middle', () => {
+      const link1 = { component: MockView1, name: 'viewone', segment: 'view-one/paramOne/:paramOne/paramTwo/:paramTwo' };
+      const link2 = { component: MockView1, name: 'viewtwo', segment: 'view-two/user/:userId' };
+      const link3 = { component: MockView1, name: 'viewthree', segment: 'view-three/:itemId' };
+      const link4 = { component: MockView1, name: 'viewfour', segment: 'view-four' };
+
+      const links = normalizeLinks([link1, link2, link3, link4]);
+      const url = 'view-two/user/fred/nav/123/view-one/paramOne/taco/paramTwo/burrito/nav/456/view-three/12345';
+      const segmentPairs = convertUrlToDehydratedSegments(url, links);
+      expect(segmentPairs.length).toEqual(3);
+      expect(segmentPairs[0].segments.length).toEqual(1);
+      expect(segmentPairs[0].segments[0].id).toEqual('view-two/user/fred');
+      expect(segmentPairs[0].segments[0].data.userId).toEqual('fred');
+
+      expect(segmentPairs[1].segments.length).toEqual(1);
+      expect(segmentPairs[1].segments[0].id).toEqual('view-one/paramOne/taco/paramTwo/burrito');
+      expect(segmentPairs[1].segments[0].data.paramOne).toEqual('taco');
+      expect(segmentPairs[1].segments[0].data.paramTwo).toEqual('burrito');
+
+      expect(segmentPairs[2].segments.length).toEqual(1);
+      expect(segmentPairs[2].segments[0].id).toEqual('view-three/12345');
+      expect(segmentPairs[2].segments[0].data.itemId).toEqual('12345');
+    });
+
+    it('it should return a data-driven set of segments with a root nav and multiple nav segments in the middle', () => {
+      const link1 = { component: MockView1, name: 'viewone', segment: 'view-one/paramOne/:paramOne/paramTwo/:paramTwo' };
+      const link2 = { component: MockView1, name: 'viewtwo', segment: 'view-two/user/:userId' };
+      const link3 = { component: MockView1, name: 'viewthree', segment: 'view-three/:itemId' };
+      const link4 = { component: MockView1, name: 'viewfour', segment: 'view-four' };
+
+      const links = normalizeLinks([link1, link2, link3, link4]);
+      const url = 'nav/app/view-two/user/fred/nav/123/view-one/paramOne/taco/paramTwo/burrito/nav/456/view-three/12345';
+      const segmentPairs = convertUrlToDehydratedSegments(url, links);
+      expect(segmentPairs.length).toEqual(3);
+      expect(segmentPairs[0].segments.length).toEqual(1);
+      expect(segmentPairs[0].segments[0].id).toEqual('view-two/user/fred');
+      expect(segmentPairs[0].segments[0].data.userId).toEqual('fred');
+
+      expect(segmentPairs[1].segments.length).toEqual(1);
+      expect(segmentPairs[1].segments[0].id).toEqual('view-one/paramOne/taco/paramTwo/burrito');
+      expect(segmentPairs[1].segments[0].data.paramOne).toEqual('taco');
+      expect(segmentPairs[1].segments[0].data.paramTwo).toEqual('burrito');
+
+      expect(segmentPairs[2].segments.length).toEqual(1);
+      expect(segmentPairs[2].segments[0].id).toEqual('view-three/12345');
+      expect(segmentPairs[2].segments[0].data.itemId).toEqual('12345');
+    });
+
+    it('it should return a data-driven set of segments with a root tabs and multiple tabs segments in the middle', () => {
+      const link1 = { component: MockView1, name: 'viewone', segment: 'view-one/paramOne/:paramOne/paramTwo/:paramTwo' };
+      const link2 = { component: MockView1, name: 'viewtwo', segment: 'view-two/user/:userId' };
+      const link3 = { component: MockView1, name: 'viewthree', segment: 'view-three/:itemId' };
+      const link4 = { component: MockView1, name: 'viewfour', segment: 'view-four' };
+
+      const links = normalizeLinks([link1, link2, link3, link4]);
+      const url = 'tabs/app/tab-two/view-two/user/fred/tabs/123/tab-three/view-one/paramOne/taco/paramTwo/burrito/tabs/456/tab-four/view-three/12345';
+      const segmentPairs = convertUrlToDehydratedSegments(url, links);
+      expect(segmentPairs.length).toEqual(3);
+      expect(segmentPairs[0].segments.length).toEqual(1);
+      expect(segmentPairs[0].segments[0].id).toEqual('view-two/user/fred');
+      expect(segmentPairs[0].segments[0].data.userId).toEqual('fred');
+
+      expect(segmentPairs[1].segments.length).toEqual(1);
+      expect(segmentPairs[1].segments[0].id).toEqual('view-one/paramOne/taco/paramTwo/burrito');
+      expect(segmentPairs[1].segments[0].data.paramOne).toEqual('taco');
+      expect(segmentPairs[1].segments[0].data.paramTwo).toEqual('burrito');
+
+      expect(segmentPairs[2].segments.length).toEqual(1);
+      expect(segmentPairs[2].segments[0].id).toEqual('view-three/12345');
+      expect(segmentPairs[2].segments[0].data.itemId).toEqual('12345');
+    });
+
+    it('should return a data-driven set of segments where the root tabs is implied but the secondary identifier is actually grabed', () => {
+      const link1 = { component: MockView1, name: 'viewone', segment: 'view-one/paramOne/:paramOne/paramTwo/:paramTwo' };
+      const link2 = { component: MockView1, name: 'viewtwo', segment: 'view-two/user/:userId' };
+      const link3 = { component: MockView1, name: 'viewthree', segment: 'view-three/:itemId' };
+      const link4 = { component: MockView1, name: 'viewfour', segment: 'view-four' };
+
+      const links = normalizeLinks([link1, link2, link3, link4]);
+      const url = 'tab-two/view-two/user/fred' + '/tab-three/view-one/paramOne/taco/paramTwo/burrito' + '/tab-four/view-three/12345';
+
+      const segmentPairs = convertUrlToDehydratedSegments(url, links);
+      expect(segmentPairs.length).toEqual(1);
+      expect(segmentPairs[0].segments.length).toEqual(3);
+      expect(segmentPairs[0].segments[0].id).toEqual('view-two/user/fred');
+      expect(segmentPairs[0].segments[0].name).toEqual('viewtwo');
+      expect(segmentPairs[0].segments[0].secondaryId).toEqual('tab-two');
+      expect(segmentPairs[0].segments[0].data.userId).toEqual('fred');
+
+      expect(segmentPairs[0].segments[1].id).toEqual('view-one/paramOne/taco/paramTwo/burrito');
+      expect(segmentPairs[0].segments[1].name).toEqual('viewone');
+      expect(segmentPairs[0].segments[1].data.paramOne).toEqual('taco');
+      expect(segmentPairs[0].segments[1].data.paramTwo).toEqual('burrito');
+      expect(segmentPairs[0].segments[1].secondaryId).toEqual('tab-three');
+
+      expect(segmentPairs[0].segments[2].id).toEqual('view-three/12345');
+      expect(segmentPairs[0].segments[2].name).toEqual('viewthree');
+      expect(segmentPairs[0].segments[2].data.itemId).toEqual('12345');
+      expect(segmentPairs[0].segments[2].secondaryId).toEqual('tab-four');
+    });
+
+    it('should return a segment w/ secondary id even if it has the same name as a router link basic', () => {
+      const link1 = { component: MockView1, name: 'viewone', segment: 'view-one/paramOne/:paramOne/paramTwo/:paramTwo' };
+      const link2 = { component: MockView1, name: 'viewtwo', segment: 'view-two/user/:userId' };
+      const link3 = { component: MockView1, name: 'viewthree', segment: 'view-three/:itemId' };
+      const link4 = { component: MockView1, name: 'schedule', segment: 'schedule' };
+
+      const links = normalizeLinks([link1, link2, link3, link4]);
+      const url = 'schedule/schedule';
+
+      const segmentPairs = convertUrlToDehydratedSegments(url, links);
+      expect(segmentPairs.length).toEqual(1);
+      expect(segmentPairs[0].segments.length).toEqual(1);
+      expect(segmentPairs[0].segments[0].id).toEqual('schedule');
+      expect(segmentPairs[0].segments[0].name).toEqual('schedule');
+      expect(segmentPairs[0].segments[0].secondaryId).toEqual('schedule');
+    });
+
+    it('should return a segment for the secondary id even if it has the same name as a router link advanced', () => {
+      const link1 = { component: MockView1, name: 'about', segment: 'about/:id' };
+      const link2 = { component: MockView1, name: 'schedule', segment: 'schedule/paramOne/:paramOne/paramTwo/:paramTwo' };
+      const link3 = { component: MockView1, name: 'ThirdPage', segment: 'third-page' };
+      const link4 = { component: MockView1, name: 'FourthPage', segment: 'fourth-page/object/:objectId' };
+      const link5 = { component: MockView1, name: 'taco-page', segment: 'taco-page' };
+
+      const links = normalizeLinks([link1, link2, link3, link4, link5]);
+      const url = 'schedule/schedule/paramOne/hello/paramTwo/goodbye'
+                  + '/about/about/123'
+                  + '/tabs/t1/tab-one/third-page'
+                  + '/tabs/t2/tab-two/fourth-page/object/456'
+                  + '/fifth-page/taco-page';
+
+      const segmentPairs = convertUrlToDehydratedSegments(url, links);
+      expect(segmentPairs.length).toEqual(3);
+
+      expect(segmentPairs[0].segments.length).toEqual(2);
+
+      expect(segmentPairs[0].segments[0].id).toEqual('schedule/paramOne/hello/paramTwo/goodbye');
+      expect(segmentPairs[0].segments[0].name).toEqual('schedule');
+      expect(segmentPairs[0].segments[0].secondaryId).toEqual('schedule');
+      expect(segmentPairs[0].segments[0].data.paramOne).toEqual('hello');
+      expect(segmentPairs[0].segments[0].data.paramTwo).toEqual('goodbye');
+
+      expect(segmentPairs[0].segments[1].id).toEqual('about/123');
+      expect(segmentPairs[0].segments[1].name).toEqual('about');
+      expect(segmentPairs[0].segments[1].secondaryId).toEqual('about');
+      expect(segmentPairs[0].segments[1].data.id).toEqual('123');
+
+      expect(segmentPairs[1].segments.length).toEqual(1);
+
+      expect(segmentPairs[1].navGroup.navId).toEqual('t1');
+      expect(segmentPairs[1].navGroup.type).toEqual('tabs');
+      expect(segmentPairs[1].segments[0].id).toEqual('third-page');
+      expect(segmentPairs[1].segments[0].name).toEqual('ThirdPage');
+      expect(segmentPairs[1].segments[0].secondaryId).toEqual('tab-one');
+
+      expect(segmentPairs[2].segments.length).toEqual(2);
+
+      expect(segmentPairs[2].navGroup.navId).toEqual('t2');
+      expect(segmentPairs[2].navGroup.type).toEqual('tabs');
+      expect(segmentPairs[2].segments[0].id).toEqual('fourth-page/object/456');
+      expect(segmentPairs[2].segments[0].name).toEqual('FourthPage');
+      expect(segmentPairs[2].segments[0].secondaryId).toEqual('tab-two');
+      expect(segmentPairs[2].segments[0].data.objectId).toEqual('456');
+
+      expect(segmentPairs[2].segments[1].id).toEqual('taco-page');
+      expect(segmentPairs[2].segments[1].name).toEqual('taco-page');
+      expect(segmentPairs[2].segments[1].secondaryId).toEqual('fifth-page');
+    });
+  });
+
+  describe('convertUrlToSegments', () => {
+    it('it should return a vanilla single segment', () => {
+
+      const link1 = { component: MockView1, name: 'login-page', segment: 'login-page' };
+      const link2 = { component: MockView1, name: 'settings-page', segment: 'settings-page' };
+      const link3 = { component: MockView1, name: 'details-page', segment: 'details-page' };
+
+      const mockNav = mockNavController();
+      serializer._app.registerRootNav(mockNav);
+
+      const links = normalizeLinks([link1, link2, link3]);
+      const url = 'settings-page';
+
+
+      const segments = convertUrlToSegments(serializer._app, url, links);
+      expect(segments.length).toEqual(1);
+      expect(segments[0].type).toEqual('nav');
+      expect(segments[0].navId).toEqual(mockNav.id);
+    });
+  });
+
   var serializer: UrlSerializer;
 
   beforeEach(() => {
@@ -718,5 +834,5 @@ class NotFound {}
 
 function mockSerializer(navLinks?: NavLink[]) {
   let deepLinkConfig = mockDeepLinkConfig(navLinks);
-  return new UrlSerializer(deepLinkConfig);
+  return new UrlSerializer(mockApp(), deepLinkConfig);
 }
diff --git a/src/navigation/test/view-controller.spec.ts b/src/navigation/test/view-controller.spec.ts
index 3cf991666db..a8cb114a9a9 100644
--- a/src/navigation/test/view-controller.spec.ts
+++ b/src/navigation/test/view-controller.spec.ts
@@ -4,7 +4,7 @@ import { STATE_ATTACHED } from '../nav-util';
 describe('ViewController', () => {
 
   describe('willEnter', () => {
-    it('should emit LifeCycleEvent when called with component data', (done) => {
+    it('should emit LifeCycleEvent when called with component data', (done: Function) => {
       // arrange
       let viewController = mockView();
       subscription = viewController.willEnter.subscribe((event: any) => {
@@ -12,7 +12,7 @@ describe('ViewController', () => {
         expect(event).toEqual(null);
         done();
       }, (err: any) => {
-        done();
+        done(err);
       });
 
       // act
@@ -22,7 +22,7 @@ describe('ViewController', () => {
   });
 
   describe('didEnter', () => {
-    it('should emit LifeCycleEvent when called with component data', (done) => {
+    it('should emit LifeCycleEvent when called with component data', (done: Function) => {
       // arrange
       let viewController = mockView();
       subscription = viewController.didEnter.subscribe((event: any) => {
@@ -30,7 +30,7 @@ describe('ViewController', () => {
         expect(event).toEqual(null);
         done();
       }, (err: any) => {
-        done();
+        done(err);
       });
 
       // act
@@ -40,7 +40,7 @@ describe('ViewController', () => {
   });
 
   describe('willLeave', () => {
-    it('should emit LifeCycleEvent when called with component data', (done) => {
+    it('should emit LifeCycleEvent when called with component data', (done: Function) => {
       // arrange
       let viewController = mockView();
       subscription = viewController.willLeave.subscribe((event: any) => {
@@ -48,7 +48,7 @@ describe('ViewController', () => {
         expect(event).toEqual(null);
         done();
       }, (err: any) => {
-        done();
+        done(err);
       });
 
       // act
@@ -58,7 +58,7 @@ describe('ViewController', () => {
   });
 
   describe('didLeave', () => {
-    it('should emit LifeCycleEvent when called with component data', (done) => {
+    it('should emit LifeCycleEvent when called with component data', (done: Function) => {
       // arrange
       let viewController = mockView();
       subscription = viewController.didLeave.subscribe((event: any) => {
@@ -66,7 +66,7 @@ describe('ViewController', () => {
         expect(event).toEqual(null);
         done();
       }, (err: any) => {
-        done();
+        done(err);
       });
 
       // act
@@ -75,14 +75,14 @@ describe('ViewController', () => {
   });
 
   describe('willUnload', () => {
-    it('should emit LifeCycleEvent when called with component data', (done) => {
+    it('should emit LifeCycleEvent when called with component data', (done: Function) => {
       // arrange
       let viewController = mockView();
       subscription = viewController.willUnload.subscribe((event: any) => {
         expect(event).toEqual(null);
         done();
       }, (err: any) => {
-        done();
+        done(err);
       });
 
       // act
diff --git a/src/navigation/url-serializer.ts b/src/navigation/url-serializer.ts
index 5db4b5bd655..411290f3688 100644
--- a/src/navigation/url-serializer.ts
+++ b/src/navigation/url-serializer.ts
@@ -1,6 +1,8 @@
 import { OpaqueToken } from '@angular/core';
 
-import { DeepLinkConfig, NavLink, NavSegment } from './nav-util';
+import { App } from '../components/app/app';
+import { NavigationContainer } from './navigation-container';
+import { DeepLinkConfig, DehydratedSegment, DehydratedSegmentPair, NavGroup, NavLink, NavSegment } from './nav-util';
 import { isArray, isBlank, isPresent } from '../util/util';
 
 
@@ -10,7 +12,7 @@ import { isArray, isBlank, isPresent } from '../util/util';
 export class UrlSerializer {
   links: NavLink[];
 
-  constructor(config: DeepLinkConfig) {
+  constructor(public _app: App, config: DeepLinkConfig) {
     if (config && isArray(config.links)) {
       this.links = normalizeLinks(config.links);
 
@@ -30,21 +32,17 @@ export class UrlSerializer {
 
     // trim off data after ? and #
     browserUrl = browserUrl.split('?')[0].split('#')[0];
-
-    return parseUrlParts(browserUrl.split('/'), this.links);
+    return convertUrlToSegments(this._app, browserUrl, this.links);
   }
 
-  createSegmentFromName(nameOrComponent: any): NavSegment {
-    const configLink = this.getLinkFromName(nameOrComponent);
 
-    return configLink ? {
-      id: configLink.name,
-      name: configLink.name,
-      component: configLink.component,
-      loadChildren: configLink.loadChildren,
-      data: null,
-      defaultHistory: configLink.defaultHistory
-    } : null;
+
+  createSegmentFromName(navContainer: NavigationContainer, nameOrComponent: any): NavSegment {
+    const configLink = this.getLinkFromName(nameOrComponent);
+    if (configLink) {
+      return this._createSegment(this._app, navContainer, configLink, null);
+    }
+    return null;
   }
 
   getLinkFromName(nameOrComponent: any) {
@@ -58,26 +56,44 @@ export class UrlSerializer {
    * Serialize a path, which is made up of multiple NavSegments,
    * into a URL string. Turn each segment into a string and concat them to a URL.
    */
-  serialize(path: NavSegment[]): string {
-    return '/' + path.map(segment => segment.id).join('/');
+  serialize(segments: NavSegment[]): string {
+    if (!segments || !segments.length) {
+      return '/';
+    }
+    const sections = segments.map(segment => {
+      if (segment.type === 'tabs') {
+        if (segment.requiresExplicitNavPrefix) {
+          return `/${segment.type}/${segment.navId}/${segment.secondaryId}/${segment.id}`;
+        }
+        return `/${segment.secondaryId}/${segment.id}`;
+      }
+      // it's a nav
+      if (segment.requiresExplicitNavPrefix) {
+        return `/${segment.type}/${segment.navId}/${segment.id}`;
+      }
+      return `/${segment.id}`;
+    });
+    return sections.join('');
   }
 
   /**
    * Serializes a component and its data into a NavSegment.
    */
-  serializeComponent(component: any, data: any): NavSegment {
+  serializeComponent(navContainer: NavigationContainer, component: any, data: any): NavSegment {
     if (component) {
       const link = findLinkByComponentData(this.links, component, data);
       if (link) {
-        return this._createSegment(link, data);
+        return this._createSegment(this._app, navContainer, link, data);
       }
     }
     return null;
   }
 
-  /** @internal */
-  _createSegment(configLink: NavLink, data: any): NavSegment {
-    let urlParts = configLink.parts;
+  /**
+ * @internal
+ */
+  _createSegment(app: App, navContainer: NavigationContainer, configLink: NavLink, data: any): NavSegment {
+    let urlParts = configLink.segmentParts;
 
     if (isPresent(data)) {
       // create a copy of the original parts in the link config
@@ -102,99 +118,45 @@ export class UrlSerializer {
       }
     }
 
+    let requiresExplicitPrefix = true;
+    if (navContainer.parent) {
+      requiresExplicitPrefix = navContainer.parent && navContainer.parent.getAllChildNavs().length > 1;
+    } else {
+      // if it's a root nav, and there are multiple root navs, we need an explicit prefix
+      requiresExplicitPrefix = app.getRootNavById(navContainer.id) && app.getRootNavs().length > 1;
+    }
+
     return {
       id: urlParts.join('/'),
       name: configLink.name,
       component: configLink.component,
       loadChildren: configLink.loadChildren,
       data: data,
-      defaultHistory: configLink.defaultHistory
+      defaultHistory: configLink.defaultHistory,
+      navId: navContainer.name || navContainer.id,
+      type: navContainer.getType(),
+      secondaryId: navContainer.getSecondaryIdentifier(),
+      requiresExplicitNavPrefix: requiresExplicitPrefix
     };
   }
-
-  formatUrlPart(name: string): string {
-    name = name.replace(URL_REPLACE_REG, '-');
-    name = name.charAt(0).toLowerCase() + name.substring(1).replace(/[A-Z]/g, match => {
-      return '-' + match.toLowerCase();
-    });
-    while (name.indexOf('--') > -1) {
-      name = name.replace('--', '-');
-    }
-    if (name.charAt(0) === '-') {
-      name = name.substring(1);
-    }
-    if (name.substring(name.length - 1) === '-') {
-      name = name.substring(0, name.length - 1);
-    }
-    return encodeURIComponent(name);
-  }
-
 }
 
-export const parseUrlParts = (urlParts: string[], configLinks: NavLink[]): NavSegment[] => {
-  const configLinkLen = configLinks.length;
-  const urlPartsLen = urlParts.length;
-  const segments: NavSegment[] = new Array(urlPartsLen);
-
-  for (var i = 0; i < configLinkLen; i++) {
-    // compare url parts to config link parts to create nav segments
-    var configLink = configLinks[i];
-    if (configLink.partsLen <= urlPartsLen) {
-      fillMatchedUrlParts(segments, urlParts, configLink);
-    }
+export function formatUrlPart(name: string): string {
+  name = name.replace(URL_REPLACE_REG, '-');
+  name = name.charAt(0).toLowerCase() + name.substring(1).replace(/[A-Z]/g, match => {
+    return '-' + match.toLowerCase();
+  });
+  while (name.indexOf('--') > -1) {
+    name = name.replace('--', '-');
   }
-
-  // remove all the undefined segments
-  for (var i = urlPartsLen - 1; i >= 0; i--) {
-    if (segments[i] === undefined) {
-      if (urlParts[i] === undefined) {
-        // not a used part, so remove it
-        segments.splice(i, 1);
-
-      } else {
-        // create an empty part
-        segments[i] = {
-          id: urlParts[i],
-          name: urlParts[i],
-          component: null,
-          loadChildren: null,
-          data: null
-        };
-      }
-    }
+  if (name.charAt(0) === '-') {
+    name = name.substring(1);
   }
-
-  return segments;
-};
-
-export const fillMatchedUrlParts = (segments: NavSegment[], urlParts: string[], configLink: NavLink) => {
-  for (var i = 0; i < urlParts.length; i++) {
-    var urlI = i;
-
-    for (var j = 0; j < configLink.partsLen; j++) {
-      if (isPartMatch(urlParts[urlI], configLink.parts[j])) {
-        urlI++;
-      } else {
-        break;
-      }
-    }
-
-    if ((urlI - i) === configLink.partsLen) {
-      var matchedUrlParts = urlParts.slice(i, urlI);
-      for (var j = i; j < urlI; j++) {
-        urlParts[j] = undefined;
-      }
-      segments[i] = {
-        id: matchedUrlParts.join('/'),
-        name: configLink.name,
-        component: configLink.component,
-        loadChildren: configLink.loadChildren,
-        data: createMatchedData(matchedUrlParts, configLink),
-        defaultHistory: configLink.defaultHistory
-      };
-    }
+  if (name.substring(name.length - 1) === '-') {
+    name = name.substring(0, name.length - 1);
   }
-};
+  return encodeURIComponent(name);
+}
 
 export const isPartMatch = (urlPart: string, configLinkPart: string) => {
   if (isPresent(urlPart) && isPresent(configLinkPart)) {
@@ -209,10 +171,10 @@ export const isPartMatch = (urlPart: string, configLinkPart: string) => {
 export const createMatchedData = (matchedUrlParts: string[], link: NavLink): any => {
   let data: any = null;
 
-  for (var i = 0; i < link.partsLen; i++) {
-    if (link.parts[i].charAt(0) === ':') {
+  for (var i = 0; i < link.segmentPartsLen; i++) {
+    if (link.segmentParts[i].charAt(0) === ':') {
       data = data || {};
-      data[link.parts[i].substring(1)] = decodeURIComponent(matchedUrlParts[i]);
+      data[link.segmentParts[i].substring(1)] = decodeURIComponent(matchedUrlParts[i]);
     }
   }
 
@@ -263,18 +225,18 @@ export const normalizeLinks = (links: NavLink[]): NavLink[] => {
     }
 
     link.dataKeys = {};
-    link.parts = link.segment.split('/');
-    link.partsLen = link.parts.length;
+    link.segmentParts = link.segment.split('/');
+    link.segmentPartsLen = link.segmentParts.length;
 
     // used for sorting
     link.staticLen = link.dataLen = 0;
     var stillCountingStatic = true;
 
-    for (var j = 0; j < link.partsLen; j++) {
-      if (link.parts[j].charAt(0) === ':') {
+    for (var j = 0; j < link.segmentPartsLen; j++) {
+      if (link.segmentParts[j].charAt(0) === ':') {
         link.dataLen++;
         stillCountingStatic = false;
-        link.dataKeys[link.parts[j].substring(1)] = true;
+        link.dataKeys[link.segmentParts[j].substring(1)] = true;
 
       } else if (stillCountingStatic) {
         link.staticLen++;
@@ -289,10 +251,10 @@ export const normalizeLinks = (links: NavLink[]): NavLink[] => {
 
 function sortConfigLinks(a: NavLink, b: NavLink) {
   // sort by the number of parts
-  if (a.partsLen > b.partsLen) {
+  if (a.segmentPartsLen > b.segmentPartsLen) {
     return -1;
   }
-  if (a.partsLen < b.partsLen) {
+  if (a.segmentPartsLen < b.segmentPartsLen) {
     return 1;
   }
 
@@ -322,6 +284,267 @@ const URL_REPLACE_REG = /\s+|\?|\!|\$|\,|\.|\+|\"|\'|\*|\^|\||\/|\\|\[|\]|#|%|`|
  */
 export const DeepLinkConfigToken = new OpaqueToken('USERLINKS');
 
-export function setupUrlSerializer(userDeepLinkConfig: any): UrlSerializer {
-  return new UrlSerializer(userDeepLinkConfig);
+export function setupUrlSerializer(app: App, userDeepLinkConfig: any): UrlSerializer {
+  return new UrlSerializer(app, userDeepLinkConfig);
+}
+
+export function navGroupStringtoObjects(navGroupStrings: string[]): NavGroup[] {
+  // each string has a known format-ish, convert it to it
+  return navGroupStrings.map(navGroupString => {
+    const sections = navGroupString.split('/');
+    if (sections[0] === 'nav') {
+      return {
+        type: 'nav',
+        navId: sections[1],
+        niceId: sections[1],
+        secondaryId: null,
+        segmentPieces: sections.splice(2)
+      };
+    } else if (sections[0] === 'tabs') {
+      return {
+        type: 'tabs',
+        navId: sections[1],
+        niceId: sections[1],
+        secondaryId: sections[2],
+        segmentPieces: sections.splice(3)
+      };
+    }
+    return {
+      type: null,
+      navId: null,
+      niceId: null,
+      secondaryId: null,
+      segmentPieces: sections
+    };
+  });
+}
+
+export function urlToNavGroupStrings(url: string) {
+  const tokens = url.split('/');
+  const keywordIndexes = [];
+  for (let i = 0; i < tokens.length; i++) {
+    if (i !== 0 && (tokens[i] === 'nav' || tokens[i] === 'tabs')) {
+      keywordIndexes.push(i);
+    }
+  }
+  // append the last index + 1 to the list no matter what
+  keywordIndexes.push(tokens.length);
+  const groupings: string[] = [];
+  let activeKeywordIndex = 0;
+  let tmpArray: string[] = [];
+  for (let i = 0; i < tokens.length; i++) {
+    if (i >= keywordIndexes[activeKeywordIndex]) {
+      groupings.push(tmpArray.join('/'));
+      tmpArray = [];
+      activeKeywordIndex++;
+    }
+    tmpArray.push(tokens[i]);
+  }
+  // okay, after the loop we've gotta push one more time just to be safe
+  groupings.push(tmpArray.join('/'));
+  return groupings;
+}
+
+export function convertUrlToSegments(app: App, url: string, navLinks: NavLink[]): NavSegment[] {
+  const pairs = convertUrlToDehydratedSegments(url, navLinks);
+  return hydrateSegmentsWithNav(app, pairs);
+}
+
+export function convertUrlToDehydratedSegments(url: string, navLinks: NavLink[]): DehydratedSegmentPair[] {
+  const navGroupStrings = urlToNavGroupStrings(url);
+  const navGroups = navGroupStringtoObjects(navGroupStrings);
+  return getSegmentsFromNavGroups(navGroups, navLinks);
+}
+
+export function hydrateSegmentsWithNav(app: App, dehydratedSegmentPairs: DehydratedSegmentPair[]) {
+  const segments: NavSegment[] = [];
+  for (let i = 0; i < dehydratedSegmentPairs.length; i++) {
+    let navs = getNavFromNavGroup(dehydratedSegmentPairs[i].navGroup, app);
+    // okay, cool, let's walk through the segments and hydrate them
+    for (const dehydratedSegment of dehydratedSegmentPairs[i].segments) {
+      if (navs.length === 1) {
+        segments.push(hydrateSegment(dehydratedSegment, navs[0]));
+        navs = navs[0].getActiveChildNavs();
+      } else if (navs.length > 1) {
+        // this is almost certainly an async race condition bug in userland
+        // if you're in this state, it would be nice to just bail here
+        // but alas we must perservere and handle the issue
+        // the simple solution is to just use the last child
+        // because that is probably what the user wants anyway
+        // remember, do not harm, even if it makes our shizzle ugly
+        segments.push(hydrateSegment(dehydratedSegment, navs[navs.length - 1]));
+        navs = navs[navs.length - 1].getActiveChildNavs();
+      } else {
+        break;
+      }
+    }
+  }
+  return segments;
+}
+
+export function getNavFromNavGroup(navGroup: NavGroup, app: App): NavigationContainer[] {
+  if (navGroup.navId) {
+    const rootNav = app.getNavByIdOrName(navGroup.navId);
+    if (rootNav) {
+      return [rootNav];
+    }
+    return [];
+  }
+  // we don't know what nav to use, so just use the root nav.
+  // if there is more than one root nav, throw an error
+  return app.getRootNavs();
+}
+
+/*
+ * Let's face the facts: Getting a dehydrated segment from the url is really hard
+ * because we need to do a ton of crazy looping
+ * the are chunks of a url that are totally irrelevant at this stage, such as the secondary identifier
+ * stating which tab is selected, etc.
+ * but is necessary.
+ * We look at segment pieces in reverse order to try to build segments
+ * as in, if you had an array like this
+ * ['my', 'super', 'cool', 'url']
+ * we want to look at the pieces in reverse order:
+ * url
+ * cool url
+ * super cool url
+ * my super cool url
+ * cool
+ * super cool
+ * my super cool
+ * super
+ * my super
+ * my
+ **/
+export function getSegmentsFromNavGroups(navGroups: NavGroup[], navLinks: NavLink[]) {
+  const pairs: DehydratedSegmentPair[] = [];
+  const usedNavLinks = new Set<string>();
+  for (const navGroup of navGroups) {
+    const segments: DehydratedSegment[] = [];
+
+    const segmentPieces = navGroup.segmentPieces.concat([]);
+
+    for (let i = segmentPieces.length; i >= 0; i--) {
+      let created = false;
+      for (let j = 0; j < i; j++) {
+        const startIndex = i - j - 1;
+        const endIndex = i;
+        const subsetOfUrl = segmentPieces.slice(startIndex, endIndex);
+        for (const navLink of navLinks) {
+          if (!usedNavLinks.has(navLink.name)) {
+            const segment = getSegmentsFromUrlPieces(subsetOfUrl, navLink);
+
+            if (segment) {
+              i = startIndex + 1;
+              usedNavLinks.add(navLink.name);
+              created = true;
+              // sweet, we found a segment
+              segments.push(segment);
+              // now we want to null out the url subsection in the segmentPieces
+              for (let k = startIndex; k < endIndex; k++) {
+                segmentPieces[k] = null;
+              }
+              break;
+            }
+          }
+        }
+        if (created) {
+          break;
+        }
+      }
+      if (!created && segmentPieces[i - 1]) {
+        // this is very likely a tab's secondary identifier
+        segments.push({
+          id: null,
+          name: null,
+          secondaryId: segmentPieces[i - 1],
+          component: null,
+          loadChildren: null,
+          data: null,
+          defaultHistory: null
+        });
+      }
+    }
+
+    // since we're getting segments in from right-to-left in the url, reverse them
+    // so they're in the correct order. Also filter out and bogus segments
+    const orderedSegments = segments.reverse();
+
+
+    // okay, this is the lazy persons approach here.
+    // so here's the deal! Right now if section of the url is not a part of a segment
+    // it is almost certainly the secondaryId for a tabs component
+    // basically, knowing the segment for the `tab` itself is good, but we also need to know
+    // which tab is selected, so we have an identifer in the url that is associated with the tabs component
+    // telling us which tab is selected. With that in mind, we are going to go through and find the segments with only secondary identifiers,
+    // and simply add the secondaryId to the next segment, and then remove the empty segment from the list
+    for (let i = 0; i < orderedSegments.length; i++) {
+      if (orderedSegments[i].secondaryId && !orderedSegments[i].id && ((i + 1) <= orderedSegments.length - 1)) {
+        orderedSegments[i + 1].secondaryId = orderedSegments[i].secondaryId;
+        orderedSegments[i] = null;
+      }
+    }
+
+    const cleanedSegments = segments.filter(segment => !!segment);
+    // if the nav group has a secondary id, make sure the first segment also has it set
+    if (navGroup.secondaryId && segments.length) {
+      cleanedSegments[0].secondaryId = navGroup.secondaryId;
+    }
+
+    pairs.push({
+      navGroup: navGroup,
+      segments: cleanedSegments
+    });
+  }
+  return pairs;
+}
+
+export function getSegmentsFromUrlPieces(urlSections: string[], navLink: NavLink): DehydratedSegment {
+  if (navLink.segmentPartsLen !== urlSections.length) {
+    return null;
+  }
+  for (let i = 0; i < urlSections.length; i++) {
+    if (!isPartMatch(urlSections[i], navLink.segmentParts[i])) {
+      // just return an empty array if the part doesn't match
+      return null;
+    }
+  }
+  return {
+    id: urlSections.join('/'),
+    name: navLink.name,
+    component: navLink.component,
+    loadChildren: navLink.loadChildren,
+    data: createMatchedData(urlSections, navLink),
+    defaultHistory: navLink.defaultHistory
+  };
+}
+
+export function hydrateSegment(segment: DehydratedSegment, nav: NavigationContainer) {
+  const hydratedSegment = Object.assign({}, segment) as NavSegment;
+  hydratedSegment.type = nav.getType();
+  hydratedSegment.navId = nav.name || nav.id;
+  // secondaryId is set on an empty dehydrated segment in the case of tabs to identify which tab is selected
+  hydratedSegment.secondaryId = segment.secondaryId;
+  return hydratedSegment;
+}
+
+export function getNonHydratedSegmentIfLinkAndUrlMatch(urlChunks: string[], navLink: NavLink): DehydratedSegment {
+  let allSegmentsMatch = true;
+  for (let i = 0; i < urlChunks.length; i++) {
+    if (!isPartMatch(urlChunks[i], navLink.segmentParts[i])) {
+      allSegmentsMatch = false;
+      break;
+    }
+  }
+  if (allSegmentsMatch) {
+    return {
+      id: navLink.segmentParts.join('/'),
+      name: navLink.name,
+      component: navLink.component,
+      loadChildren: navLink.loadChildren,
+      data: createMatchedData(urlChunks, navLink),
+      defaultHistory: navLink.defaultHistory
+    };
+  }
+  return null;
 }
diff --git a/src/navigation/view-controller.ts b/src/navigation/view-controller.ts
index a89538abf5f..70cabfa4c86 100644
--- a/src/navigation/view-controller.ts
+++ b/src/navigation/view-controller.ts
@@ -1,8 +1,8 @@
 import { ComponentRef, ElementRef, EventEmitter, Output, Renderer } from '@angular/core';
 
-import { isPresent, assert } from '../util/util';
+import { assert, isPresent } from '../util/util';
 import { NavController } from './nav-controller';
-import { NavOptions, STATE_NEW, STATE_INITIALIZED, STATE_ATTACHED, STATE_DESTROYED } from './nav-util';
+import { NavOptions, STATE_ATTACHED, STATE_DESTROYED, STATE_INITIALIZED, STATE_NEW } from './nav-util';
 import { NavParams } from './nav-params';
 import { Content, Footer, Header, Navbar } from './nav-interfaces';
 
@@ -46,6 +46,7 @@ export class ViewController {
   _zIndex: number;
   _state: number = STATE_NEW;
   _cssClass: string;
+  _ts: number;
 
   /**
    * Observable to be subscribed to when the current component will become active
@@ -111,6 +112,7 @@ export class ViewController {
     this.data = (data instanceof NavParams ? data.data : (isPresent(data) ? data : {}));
 
     this._cssClass = rootCssClass;
+    this._ts = Date.now();
   }
 
   /**
@@ -118,7 +120,7 @@ export class ViewController {
    */
   init(componentRef: ComponentRef<any>) {
     assert(componentRef, 'componentRef can not be null');
-
+    this._ts = Date.now();
     this._cmp = componentRef;
     this.instance = this.instance || componentRef.instance;
     this._detached = false;
@@ -195,7 +197,7 @@ export class ViewController {
   /**
    * @hidden
    */
-  getTransitionName(direction: string): string {
+  getTransitionName(_direction: string): string {
     return this._nav && this._nav.config.get('pageTransition');
   }
 
diff --git a/src/platform/dom-controller.ts b/src/platform/dom-controller.ts
index 8d5675ce274..32daa83d0d5 100644
--- a/src/platform/dom-controller.ts
+++ b/src/platform/dom-controller.ts
@@ -28,7 +28,7 @@ export class DomDebouncer {
     });
   }
 
-  write(fn: DomCallback, ctx?: any): Function {
+  write(fn: DomCallback): Function {
     if (this.writeTask) {
       return;
     }
diff --git a/src/platform/keyboard.ts b/src/platform/keyboard.ts
index fa3d4b12f30..edd0dc39295 100644
--- a/src/platform/keyboard.ts
+++ b/src/platform/keyboard.ts
@@ -1,4 +1,4 @@
-import { Injectable, NgZone } from '@angular/core';
+import { EventEmitter, Injectable, NgZone } from '@angular/core';
 
 import { Config } from '../config/config';
 import { DomController } from './dom-controller';
@@ -24,29 +24,85 @@ import { Platform } from './platform';
  */
 @Injectable()
 export class Keyboard {
-  private _tmr: any;
 
-  constructor(config: Config, private _plt: Platform, private _zone: NgZone, private _dom: DomController) {
+  _tmr: number;
+
+  willShow = new EventEmitter<void>();
+  willHide = new EventEmitter<void>();
+  didShow = new EventEmitter<void>();
+  didHide = new EventEmitter<void>();
+
+  eventsAvailable = false;
+
+  constructor(
+    config: Config,
+    private _plt: Platform,
+    private _zone: NgZone,
+    private _dom: DomController
+  ) {
     this.focusOutline(config.get('focusOutline'));
 
-    const win = _plt.win();
+    const win = <any>_plt.win();
+    if (config.getBoolean('keyboardResizes', false)) {
+      this.listenV2(win);
+    } else {
+      this.listenV1(win);
+    }
+  }
+
+  private listenV2(win: any) {
+    const platform = this._plt;
+    platform.registerListener(win, 'keyboardWillShow', () => {
+      this._zone.run(() => {
+        this.willShow.emit();
+      });
+    }, { zone: false, passive: true });
+
+    platform.registerListener(win, 'keyboardWillHide', () => {
+      this._zone.run(() => {
+        this.willHide.emit();
+      });
+    }, { zone: false, passive: true });
+
+    platform.registerListener(win, 'keyboardDidShow', () => {
+      this._zone.run(() => {
+        this.didShow.emit();
+      });
+    }, { zone: false, passive: true });
+
+    platform.registerListener(win, 'keyboardDidHide', () => {
+      this._zone.run(() => {
+        this.didHide.emit();
+      });
+    }, { zone: false, passive: true });
+    this.eventsAvailable = true;
+  }
+
+  private listenV1(win: any) {
+    const platform = this._plt;
 
-    _plt.registerListener(win, 'native.keyboardhide', () => {
-      _plt.cancelTimeout(this._tmr);
-      this._tmr = _plt.timeout(() => {
+    platform.registerListener(win, 'native.keyboardhide', () => {
+      this.blurActiveInput(true);
+    }, { zone: false, passive: true });
+
+    platform.registerListener(win, 'native.keyboardshow', () => {
+      this.blurActiveInput(false);
+    }, { zone: false, passive: true });
+  }
+
+  private blurActiveInput(shouldBlur: boolean) {
+    const platform = this._plt;
+    platform.cancelTimeout(this._tmr);
+    if (shouldBlur) {
+      this._tmr = platform.timeout(() => {
         // this custom cordova plugin event fires when the keyboard will hide
         // useful when the virtual keyboard is closed natively
         // https://github.com/ionic-team/ionic-plugin-keyboard
         if (this.isOpen()) {
-          this._plt.focusOutActiveElement();
+          platform.focusOutActiveElement();
         }
       }, 80);
-    }, { zone: false, passive: true });
-
-    _plt.registerListener(win, 'native.keyboardshow', () => {
-      _plt.cancelTimeout(this._tmr);
-    }, { zone: false, passive: true });
-
+    }
   }
 
   /**
diff --git a/src/platform/platform-registry.ts b/src/platform/platform-registry.ts
index 5f6e35b603d..744a13ccef1 100644
--- a/src/platform/platform-registry.ts
+++ b/src/platform/platform-registry.ts
@@ -105,6 +105,7 @@ export const PLATFORM_CONFIGS: { [key: string]: PlatformConfig } = {
     ],
     settings: {
       autoFocusAssist: 'delay',
+      hideCaretOnScroll: true,
       hoverCSS: false,
       inputBlurring: isIos,
       inputCloning: isIos,
@@ -116,6 +117,8 @@ export const PLATFORM_CONFIGS: { [key: string]: PlatformConfig } = {
       tapPolyfill: isIosUIWebView,
       virtualScrollEventAssist: isIosUIWebView,
       disableScrollAssist: isIos,
+      keyboardResizes: keyboardResizes,
+      resizeAssist: keyboardResizes,
     },
     isMatch(plt: Platform) {
       return plt.isPlatformMatch('ios', ['iphone', 'ipad', 'ipod'], ['windows phone']);
@@ -240,6 +243,13 @@ export const PLATFORM_CONFIGS: { [key: string]: PlatformConfig } = {
   }
 };
 
+function keyboardResizes(plt: Platform): boolean {
+  const win = <any>plt.win();
+  if (win.Ionic && win.Ionic.keyboardResizes === true) {
+    return true;
+  }
+  return false;
+}
 
 export const PlatformConfigToken = new OpaqueToken('PLTCONFIG');
 
diff --git a/src/tap-click/activator.ts b/src/tap-click/activator.ts
index 9e87505296d..fed984c9a14 100644
--- a/src/tap-click/activator.ts
+++ b/src/tap-click/activator.ts
@@ -20,7 +20,7 @@ export class Activator implements ActivatorBase {
     this._css = config.get('activatedClass', 'activated');
   }
 
-  clickAction(ev: UIEvent, activatableEle: HTMLElement, startCoord: PointerCoordinates) {
+  clickAction(ev: UIEvent, activatableEle: HTMLElement, _startCoord: PointerCoordinates) {
     if (isActivatedDisabled(ev, activatableEle)) {
       return;
     }
@@ -41,7 +41,7 @@ export class Activator implements ActivatorBase {
     }
   }
 
-  downAction(ev: UIEvent, activatableEle: HTMLElement, startCoord: PointerCoordinates) {
+  downAction(ev: UIEvent, activatableEle: HTMLElement, _startCoord: PointerCoordinates) {
     // the user just pressed down
     if (isActivatedDisabled(ev, activatableEle)) {
       return;
@@ -66,7 +66,7 @@ export class Activator implements ActivatorBase {
   }
 
   // the user was pressing down, then just let up
-  upAction(ev: UIEvent, activatableEle: HTMLElement, startCoord: PointerCoordinates) {
+  upAction(_ev: UIEvent, _activatableEle: HTMLElement, _startCoord: PointerCoordinates) {
     this._scheduleClear();
   }
 
diff --git a/src/tap-click/ripple.ts b/src/tap-click/ripple.ts
index 8ca85ccd810..1c2a3979ed4 100644
--- a/src/tap-click/ripple.ts
+++ b/src/tap-click/ripple.ts
@@ -45,7 +45,7 @@ export class RippleActivator implements ActivatorBase {
     this.highlight && this.highlight.clearState(animated);
   }
 
-  _downAction(ev: UIEvent, activatableEle: HTMLElement, startCoord: PointerCoordinates) {
+  _downAction(ev: UIEvent, activatableEle: HTMLElement, _startCoord: PointerCoordinates) {
     if (isActivatedDisabled(ev, activatableEle)) {
       return;
     }
@@ -79,7 +79,7 @@ export class RippleActivator implements ActivatorBase {
     }
   }
 
-  _clickAction(ev: UIEvent, activatableEle: HTMLElement, startCoord: PointerCoordinates) {
+  _clickAction(_ev: UIEvent, _activatableEle: HTMLElement, _startCoord: PointerCoordinates) {
     // NOTHING
   }
 
diff --git a/src/tap-click/tap-click.ts b/src/tap-click/tap-click.ts
index cd9875a9f36..c42b7c1e3bc 100644
--- a/src/tap-click/tap-click.ts
+++ b/src/tap-click/tap-click.ts
@@ -8,8 +8,8 @@ import { Config } from '../config/config';
 import { DomController } from '../platform/dom-controller';
 import { GestureController } from '../gestures/gesture-controller';
 import { Platform } from '../platform/platform';
-import { pointerCoord, hasPointerMoved } from '../util/dom';
-import { PointerEvents, POINTER_EVENT_TYPE_TOUCH } from '../gestures/pointer-events';
+import { hasPointerMoved, pointerCoord } from '../util/dom';
+import { POINTER_EVENT_TYPE_TOUCH, PointerEvents } from '../gestures/pointer-events';
 import { RippleActivator } from './ripple';
 import { UIEventManager } from '../gestures/ui-event-manager';
 
@@ -247,7 +247,7 @@ export function isActivatable(ele: HTMLElement) {
     }
   }
   return false;
-};
+}
 
 const ACTIVATABLE_ELEMENTS = ['A', 'BUTTON'];
 const ACTIVATABLE_ATTRIBUTES = ['tappable', 'ion-button'];
diff --git a/src/tap-click/test/activator.spec.ts b/src/tap-click/test/activator.spec.ts
index 43709e7f60c..89d67f7f6ef 100644
--- a/src/tap-click/test/activator.spec.ts
+++ b/src/tap-click/test/activator.spec.ts
@@ -1,6 +1,6 @@
 import { Activator } from '../activator';
 import { Config } from '../../config/config';
-import { mockDomController, MockDomController } from '../../util/mock-providers';
+import { MockDomController, mockDomController } from '../../util/mock-providers';
 
 
 describe('Activator', () => {
diff --git a/src/themes/ionic.globals.scss b/src/themes/ionic.globals.scss
index 50629a8534b..3cee0dcdf0c 100644
--- a/src/themes/ionic.globals.scss
+++ b/src/themes/ionic.globals.scss
@@ -12,7 +12,7 @@
 
 
 // Global app direction
-$app-direction: null !default;
+$app-direction: ltr !default;
 
 
 // Global font path
diff --git a/src/themes/ionic.mixins.scss b/src/themes/ionic.mixins.scss
index 9dedab2280e..617b2bd5702 100644
--- a/src/themes/ionic.mixins.scss
+++ b/src/themes/ionic.mixins.scss
@@ -142,7 +142,7 @@
 }
 
 @mixin multi-dir() {
-  @if $app-direction == null {
+  @if $app-direction == multi {
     $root: #{&};
     @at-root [dir="ltr"], [dir="rtl"] {
       #{$root} {
@@ -155,7 +155,7 @@
 }
 
 @mixin rtl() {
-  @if $app-direction == null {
+  @if $app-direction == multi {
     $root: #{&};
     @at-root [dir="rtl"] {
       #{$root} {
@@ -168,7 +168,7 @@
 }
 
 @mixin ltr() {
-  @if $app-direction == null {
+  @if $app-direction == multi {
     $root: #{&};
     @at-root [dir="ltr"] {
       #{$root} {
diff --git a/src/themes/util.scss b/src/themes/util.scss
index dcd542b8946..305698d4fff 100755
--- a/src/themes/util.scss
+++ b/src/themes/util.scss
@@ -62,8 +62,6 @@ ion-input :focus {
 
   opacity: 0;
 
-  // background: red;
-  // opacity: .3;
   contain: strict;
 }
 
diff --git a/src/util/base-input.ts b/src/util/base-input.ts
index 164c63c9725..45f57c465d9 100644
--- a/src/util/base-input.ts
+++ b/src/util/base-input.ts
@@ -2,7 +2,8 @@ import { AfterContentInit, ElementRef, EventEmitter, Input, NgZone, Output, Rend
 import { ControlValueAccessor } from '@angular/forms';
 import { NgControl } from '@angular/forms';
 
-import { isPresent, isUndefined, isArray, isTrueProperty, deepCopy, assert } from './util';
+import { assert, deepCopy, isArray, isPresent, isString, isTrueProperty, isUndefined  } from './util';
+import { IonicFormInput } from './form';
 import { Ion } from '../components/ion';
 import { Config } from '../config/config';
 import { Item } from '../components/item/item';
@@ -10,7 +11,7 @@ import { Form } from './form';
 import { TimeoutDebouncer } from './debouncer';
 
 
-export interface CommonInput<T> extends ControlValueAccessor, AfterContentInit {
+export interface CommonInput<T> extends ControlValueAccessor, AfterContentInit, IonicFormInput {
 
   id: string;
   disabled: boolean;
@@ -76,21 +77,22 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
     private _defaultValue: T,
     public _form: Form,
     public _item: Item,
-    ngControl: NgControl
+    public _ngControl: NgControl
   ) {
     super(config, elementRef, renderer, name);
     _form && _form.register(this);
     this._value = deepCopy(this._defaultValue);
 
     if (_item) {
+      assert('lbl-' + _item.id === _item.labelId, 'labelId was not calculated correctly');
       this.id = name + '-' + _item.registerInput(name);
-      this._labelId = 'lbl-' + _item.id;
+      this._labelId = _item.labelId;
       this._item.setElementClass('item-' + name, true);
     }
 
     // If the user passed a ngControl we need to set the valueAccessor
-    if (ngControl) {
-      ngControl.valueAccessor = this;
+    if (_ngControl) {
+      _ngControl.valueAccessor = this;
     }
   }
 
@@ -143,12 +145,9 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
     if (isUndefined(val)) {
       return false;
     }
-    let normalized;
-    if (val === null) {
-      normalized = deepCopy(this._defaultValue);
-    } else {
-      normalized = this._inputNormalize(val);
-    }
+    const normalized = (val === null)
+      ? deepCopy(this._defaultValue)
+      : this._inputNormalize(val);
 
     const notUpdate = isUndefined(normalized) || !this._inputShouldChange(normalized);
     if (notUpdate) {
@@ -157,7 +156,6 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
 
     console.debug('BaseInput: value changed:', normalized, this);
     this._value = normalized;
-    this._inputCheckHasValue(normalized);
     if (this._init) {
       this._inputUpdated();
     }
@@ -212,12 +210,11 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
     if (this._isFocus) {
       return;
     }
-    assert(this._init, 'component was not initialized');
-    assert(NgZone.isInAngularZone(), '_fireFocus: should be zoned');
+    console.debug('BaseInput: focused:', this);
 
-    this._isFocus = true;
+    this._form && this._form.setAsFocused(this);
+    this._setFocus(true);
     this.ionFocus.emit(this);
-    this._inputUpdated();
   }
 
   /**
@@ -227,11 +224,27 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
     if (!this._isFocus) {
       return;
     }
-    assert(this._init, 'component was not initialized');
-    assert(NgZone.isInAngularZone(), '_fireBlur: should be zoned');
+    console.debug('BaseInput: blurred:', this);
 
-    this._isFocus = false;
+    this._form && this._form.unsetAsFocused(this);
+    this._setFocus(false);
     this.ionBlur.emit(this);
+  }
+
+  /**
+   * @hidden
+   */
+  private _setFocus(isFocused: boolean) {
+    assert(this._init, 'component was not initialized');
+    assert(NgZone.isInAngularZone(), '_fireFocus: should be zoned');
+    assert(isFocused !== this._isFocus, 'bad internal state');
+
+    this._isFocus = isFocused;
+    const item = this._item;
+    if (item) {
+      item.setElementClass('input-has-focus', isFocused);
+      item.setElementClass('item-input-has-focus', isFocused);
+    }
     this._inputUpdated();
   }
 
@@ -255,42 +268,47 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
    */
   hasValue(): boolean {
     const val = this._value;
-    return isArray(val)
-      ? val.length > 0
-      : isPresent(val);
+    if (!isPresent(val)) {
+      return false;
+    }
+    if (isArray(val) || isString(val)) {
+      return val.length > 0;
+    }
+    return true;
   }
 
   /**
    * @hidden
    */
-  ngOnDestroy() {
-    this._form && this._form.deregister(this);
-    this._init = false;
+  focusNext() {
+    this._form && this._form.tabFocus(this);
   }
 
   /**
    * @hidden
    */
-  ngAfterContentInit() {
-    this._initialize();
+  ngOnDestroy() {
+    assert(this._init, 'input was destroed without being initialized');
+
+    const form = this._form;
+    form && form.deregister(this);
+    this._init = false;
   }
 
   /**
    * @hidden
    */
-  _inputCheckHasValue(val: T) {
-    if (!this._item) {
-      return;
-    }
-    // TODO remove all uses of input-has-value in v4
-    this._item.setElementClass('input-has-value', this.hasValue());
-    this._item.setElementClass('item-input-has-value', this.hasValue());
+  ngAfterContentInit() {
+    this._initialize();
   }
 
   /**
    * @hidden
    */
-  initFocus() { }
+  initFocus() {
+    const ele = this._elementRef.nativeElement.querySelector('button');
+    ele && ele.focus();
+  }
 
   /**
    * @hidden
@@ -326,5 +344,25 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
    */
   _inputUpdated() {
     assert(this._init, 'component should be initialized');
+    const item = this._item;
+    if (item) {
+      setControlCss(item, this._ngControl);
+      // TODO remove all uses of input-has-value in v4
+      let hasValue = this.hasValue();
+      item.setElementClass('input-has-value', hasValue);
+      item.setElementClass('item-input-has-value', hasValue);
+    }
+  }
+}
+
+function setControlCss(element: Ion, control: NgControl) {
+  if (!control) {
+    return;
   }
+  element.setElementClass('ng-untouched', control.untouched);
+  element.setElementClass('ng-touched', control.touched);
+  element.setElementClass('ng-pristine', control.pristine);
+  element.setElementClass('ng-dirty', control.dirty);
+  element.setElementClass('ng-valid', control.valid);
+  element.setElementClass('ng-invalid', !control.valid);
 }
diff --git a/src/util/datetime-util.ts b/src/util/datetime-util.ts
index 510bbf9643f..2d0466db853 100644
--- a/src/util/datetime-util.ts
+++ b/src/util/datetime-util.ts
@@ -10,8 +10,8 @@ export function renderDateTime(template: string, value: DateTimeData, locale: Lo
   let hasText = false;
   FORMAT_KEYS.forEach((format, index) => {
     if (template.indexOf(format.f) > -1) {
-      var token = '{' + index + '}';
-      var text = renderTextFormat(format.f, (<any>value)[format.k], value, locale);
+      const token = '{' + index + '}';
+      const text = renderTextFormat(format.f, (<any>value)[format.k], value, locale);
 
       if (!hasText && text && isPresent((<any>value)[format.k])) {
         hasText = true;
@@ -27,7 +27,7 @@ export function renderDateTime(template: string, value: DateTimeData, locale: Lo
     return '';
   }
 
-  for (var i = 0; i < tokens.length; i += 2) {
+  for (let i = 0; i < tokens.length; i += 2) {
     template = template.replace(tokens[i], tokens[i + 1]);
   }
 
@@ -198,11 +198,11 @@ export function parseDate(val: any): DateTimeData {
   }
 
   // ensure all the parse values exist with at least 0
-  for (var i = 1; i < 8; i++) {
+  for (let i = 1; i < 8; i++) {
     parse[i] = (parse[i] !== undefined ? parseInt(parse[i], 10) : null);
   }
 
-  var tzOffset = 0;
+  let tzOffset = 0;
   if (isPresent(parse[9]) && isPresent(parse[10])) {
     // hours
     tzOffset = parseInt(parse[10], 10) * 60;
@@ -258,7 +258,7 @@ export function updateDate(existingData: DateTimeData, newData: any): boolean {
 
       // merge new values from the picker's selection
       // to the existing DateTimeData values
-      for (var k in newData) {
+      for (const k in newData) {
         (<any>existingData)[k] = newData[k].value;
       }
 
@@ -270,7 +270,7 @@ export function updateDate(existingData: DateTimeData, newData: any): boolean {
 
   } else {
     // blank data, clear everything out
-    for (var k in existingData) {
+    for (const k in existingData) {
       delete (<any>existingData)[k];
     }
   }
@@ -324,7 +324,7 @@ export function getValueFromFormat(date: DateTimeData, format: string) {
 
 
 export function convertFormatToKey(format: string): string {
-  for (var k in FORMAT_KEYS) {
+  for (const k in FORMAT_KEYS) {
     if (FORMAT_KEYS[k].f === format) {
       return FORMAT_KEYS[k].k;
     }
diff --git a/src/util/dom.ts b/src/util/dom.ts
index 37412e37cae..62d742a905f 100644
--- a/src/util/dom.ts
+++ b/src/util/dom.ts
@@ -94,15 +94,15 @@ export function isTextInput(ele: any) {
 export const NON_TEXT_INPUT_REGEX = /^(radio|checkbox|range|file|submit|reset|color|image|button)$/i;
 
 
-const skipInputAttrsReg = /^(value|checked|disabled|type|class|style|id|autofocus|autocomplete|autocorrect)$/i;
+const SKIP_INPUT_ATTR = ['value', 'checked', 'disabled', 'readonly', 'placeholder', 'type', 'class', 'style', 'id', 'autofocus', 'autocomplete', 'autocorrect'];
 export function copyInputAttributes(srcElement: HTMLElement, destElement: HTMLElement) {
   // copy attributes from one element to another
   // however, skip over a few of them as they're already
   // handled in the angular world
-  var attrs = srcElement.attributes;
+  const attrs = srcElement.attributes;
   for (var i = 0; i < attrs.length; i++) {
     var attr = attrs[i];
-    if (!skipInputAttrsReg.test(attr.name)) {
+    if (SKIP_INPUT_ATTR.indexOf(attr.name) === -1) {
       destElement.setAttribute(attr.name, attr.value);
     }
   }
diff --git a/src/util/events.ts b/src/util/events.ts
index 0d88a67a1fc..52990592b93 100644
--- a/src/util/events.ts
+++ b/src/util/events.ts
@@ -16,7 +16,7 @@ import { ScrollView } from './scroll-view';
  * constructor(public events: Events) {}
  * createUser(user) {
  *   console.log('User created!')
- *   events.publish('user:created', user, Date.now());
+ *   this.events.publish('user:created', user, Date.now());
  * }
  *
  *
diff --git a/src/util/form.ts b/src/util/form.ts
index 8b5589728ef..2375fb85a1b 100644
--- a/src/util/form.ts
+++ b/src/util/form.ts
@@ -7,41 +7,47 @@ import { removeArrayItem } from './util';
  */
 @Injectable()
 export class Form {
-  private _focused: any = null;
+
+  private _focused: IonicFormInput = null;
   private _ids: number = -1;
-  private _inputs: any[] = [];
+  private _inputs: IonicFormInput[] = [];
 
-  register(input: any) {
+  register(input: IonicFormInput) {
     this._inputs.push(input);
   }
 
-  deregister(input: any) {
+  deregister(input: IonicFormInput) {
     removeArrayItem(this._inputs, input);
-    if (input === this._focused) {
-      this._focused = null;
-    }
+    this.unsetAsFocused(input);
   }
 
-  setAsFocused(input: any) {
+  setAsFocused(input: IonicFormInput) {
     this._focused = input;
   }
 
+  unsetAsFocused(input: IonicFormInput) {
+    if (input === this._focused) {
+      this._focused = null;
+    }
+  }
+
   /**
    * Focuses the next input element, if it exists.
    */
-  tabFocus(currentInput: any) {
-    let index = this._inputs.indexOf(currentInput);
-    if (index > -1 && (index + 1) < this._inputs.length) {
-      let nextInput = this._inputs[index + 1];
+  tabFocus(currentInput: IonicFormInput) {
+    const inputs = this._inputs;
+    let index = inputs.indexOf(currentInput) + 1;
+    if (index > 0 && index < inputs.length) {
+      var nextInput = inputs[index];
       if (nextInput !== this._focused) {
         console.debug('tabFocus, next');
         return nextInput.initFocus();
       }
     }
 
-    index = this._inputs.indexOf(this._focused);
+    index = inputs.indexOf(this._focused);
     if (index > 0) {
-      let previousInput = this._inputs[index - 1];
+      var previousInput = inputs[index - 1];
       if (previousInput) {
         console.debug('tabFocus, previous');
         previousInput.initFocus();
diff --git a/src/util/input-tester.ts b/src/util/input-tester.ts
index ef5f3bdf9e6..a300b80dfe4 100644
--- a/src/util/input-tester.ts
+++ b/src/util/input-tester.ts
@@ -45,6 +45,10 @@ export const ANY_CORPUS: any[] = [
 export interface TestConfig {
   defaultValue: any;
   corpus: any;
+  testItem?: boolean;
+  testForm?: boolean;
+  onValueChange?: (value: any) => boolean;
+  onFocusChange?: (isFocused: boolean) => boolean;
 }
 
 
@@ -54,8 +58,34 @@ export function commonInputTest<T>(input: BaseInput<T>, config: TestConfig) {
   // TODO test disable
   const zone = new NgZone(true);
   zone.run(() => {
+    if (config.testItem === true && !input._item) {
+      assert(false, 'input is invalid');
+    }
+    if (config.testForm === true && !input._form) {
+      assert(false, 'form is invalid');
+    }
+
+    // Run tests before initialization
     testInput(input, config, false);
+
     input.ngAfterContentInit();
+    (<any>input).ngAfterViewInit && (<any>input).ngAfterViewInit();
+
+    // Run tests after initialization
+    testInput(input, config, true);
+
+    // Run tests without item
+    if (config.testItem === true && !input._item) {
+      input._item = undefined;
+      testInput(input, config, true);
+    }
+
+    // Run tests without item
+    if (config.testForm === true && !input._form) {
+      input._form = undefined;
+      testInput(input, config, true);
+    }
+
     testInput(input, config, true);
     input.ngOnDestroy();
     assert(!input._init, 'input was not destroyed correctly');
@@ -80,10 +110,16 @@ function testState<T>(input: BaseInput<T>, config: TestConfig, isInit: boolean)
     const subBlur = input.ionBlur.subscribe((ev: any) => {
       assertEqual(ev, input, 'ionBlur argument is wrong');
       blurCount++;
+      if (config.onFocusChange && config.onFocusChange(false) !== true) {
+        assert(false, 'onFocusChange test failed');
+      }
     });
     const subFocus = input.ionFocus.subscribe((ev: any) => {
       assertEqual(ev, input, 'ionFocus argument is wrong');
       focusCount++;
+      if (config.onFocusChange && config.onFocusChange(true) !== true) {
+        assert(false, 'onFocusChange test failed');
+      }
     });
     input._fireFocus();
     assertEqual(input._isFocus, true, 'should be focus');
@@ -144,6 +180,9 @@ function testWriteValue<T>(input: BaseInput<T>, config: TestConfig, isInit: bool
     assertEqual(input.value, test[1], 'loop: input/output does not match');
     if (isInit) {
       assertEqual(ionChangeCalled, 1, 'loop: ionChange error');
+      if (config.onValueChange && config.onValueChange(test[1]) !== true) {
+        assert(false, 'onValueChange() test failed');
+      }
     } else {
       assertEqual(ionChangeCalled, 0, 'loop: ionChange error');
     }
@@ -215,6 +254,9 @@ function testNgModelChange<T>(input: BaseInput<T>, config: TestConfig, isInit: b
     assertEqual(input.value, test[1], 'input/output does not match');
     if (isInit) {
       assertEqual(ionChangeCalled, 1, 'ionChange error');
+      if (config.onValueChange && config.onValueChange(test[1]) !== true) {
+        assert(false, 'onValueChange() test failed');
+      }
     } else {
       assertEqual(ionChangeCalled, 0, 'ionChange error');
     }
diff --git a/src/util/mock-providers.ts b/src/util/mock-providers.ts
index 404d1368763..de863aea544 100644
--- a/src/util/mock-providers.ts
+++ b/src/util/mock-providers.ts
@@ -10,7 +10,6 @@ import { DomController } from '../platform/dom-controller';
 import { GestureController } from '../gestures/gesture-controller';
 import { Haptic } from '../tap-click/haptic';
 import { IonicApp } from '../components/app/app-root';
-import { Keyboard } from '../platform/keyboard';
 import { Menu } from '../components/menu/menu';
 import { NavOptions } from '../navigation/nav-util';
 import { NavControllerBase } from '../navigation/nav-controller-base';
@@ -31,7 +30,7 @@ import { Item } from '../components/item/item';
 import { Form } from './form';
 
 
-export function mockConfig(config?: any, url: string = '/', platform?: Platform) {
+export function mockConfig(config?: any, _url: string = '/', platform?: Platform) {
   const c = new Config();
   const p = platform || mockPlatform();
   c.init(config, p);
@@ -222,7 +221,7 @@ export function mockContent(): Content {
 }
 
 export function mockZone(): NgZone {
-  return new NgZone(false);
+  return new NgZone({enableLongStackTrace: false});
 }
 
 export function mockChangeDetectorRef(): ChangeDetectorRef {
@@ -287,9 +286,9 @@ export class MockElement {
     this.attributes[name] = val;
   }
 
-  addEventListener(type: string, listener: Function, options?: any) { }
+  addEventListener(_type: string, _listener: Function, _options?: any) { }
 
-  removeEventListener(type: string, listener: Function, options?: any) { }
+  removeEventListener(_type: string, _listener: Function, _options?: any) { }
 
   removeAttribute(name: string) {
     delete this.attributes[name];
@@ -359,7 +358,8 @@ export function mockLocation(): Location {
     path: () => { return ''; },
     subscribe: () => {},
     go: () => {},
-    back: () => {}
+    back: () => {},
+    prepareExternalUrl: () => {}
   };
   return location;
 }
@@ -390,8 +390,8 @@ export function mockComponentRef(): ComponentRef<any> {
 }
 
 export function mockDeepLinker(linkConfig: DeepLinkConfig = null, app?: App) {
-  let serializer = new UrlSerializer(linkConfig);
-
+  app = app || mockApp(mockConfig(), mockPlatform());
+  let serializer = new UrlSerializer(app, linkConfig);
   let location = mockLocation();
 
   return new DeepLinker(app || mockApp(), serializer, location, null, null);
@@ -403,7 +403,6 @@ export function mockNavController(): NavControllerBase {
   let app = mockApp(config, platform);
   let zone = mockZone();
   let dom = mockDomController(platform);
-  let keyboard = new Keyboard(config, platform, zone, dom);
   let elementRef = mockElementRef();
   let renderer = mockRenderer();
   let componentFactoryResolver: any = null;
@@ -415,7 +414,6 @@ export function mockNavController(): NavControllerBase {
     app,
     config,
     platform,
-    keyboard,
     elementRef,
     zone,
     renderer,
@@ -434,7 +432,7 @@ export function mockNavController(): NavControllerBase {
 
   (<any>nav)._orgViewInsert = nav._viewAttachToDOM;
 
-  nav._viewAttachToDOM = function(view: ViewController, componentRef: ComponentRef<any>, viewport: ViewContainerRef) {
+  nav._viewAttachToDOM = function(view: ViewController, componentRef: ComponentRef<any>, _viewport: ViewContainerRef) {
     let mockedViewport: any = {
       insert: () => { }
     };
@@ -447,12 +445,11 @@ export function mockNavController(): NavControllerBase {
 export function mockOverlayPortal(app: App, config: Config, plt: MockPlatform): OverlayPortal {
   let zone = mockZone();
   let dom = mockDomController(plt);
-  let keyboard = new Keyboard(config, plt, zone, dom);
   let elementRef = mockElementRef();
   let renderer = mockRenderer();
   let componentFactoryResolver: any = null;
   let gestureCtrl = new GestureController(app);
-  let serializer = new UrlSerializer(null);
+  let serializer = new UrlSerializer(app, null);
   let location = mockLocation();
   let deepLinker = new DeepLinker(app, serializer, location, null, null);
 
@@ -460,7 +457,6 @@ export function mockOverlayPortal(app: App, config: Config, plt: MockPlatform):
     app,
     config,
     plt,
-    keyboard,
     elementRef,
     zone,
     renderer,
@@ -474,13 +470,12 @@ export function mockOverlayPortal(app: App, config: Config, plt: MockPlatform):
   );
 }
 
-export function mockTab(parentTabs: Tabs): Tab {
+export function mockTab(parentTabs: Tabs, overrideLoad: boolean = true): Tab {
   let platform = mockPlatform();
   let config = mockConfig(null, '/', platform);
   let app = (<any>parentTabs)._app || mockApp(config, platform);
   let zone = mockZone();
   let dom = mockDomController(platform);
-  let keyboard = new Keyboard(config, platform, zone, dom);
   let elementRef = mockElementRef();
   let renderer = mockRenderer();
   let changeDetectorRef = mockChangeDetectorRef();
@@ -493,7 +488,6 @@ export function mockTab(parentTabs: Tabs): Tab {
     app,
     config,
     platform,
-    keyboard,
     elementRef,
     zone,
     renderer,
@@ -506,9 +500,11 @@ export function mockTab(parentTabs: Tabs): Tab {
     null
   );
 
-  tab.load = (opts: any, cb: Function) => {
-    cb();
-  };
+  if (overrideLoad) {
+    tab.load = (_opts: any, cb: Function) => {
+      cb();
+    };
+  }
 
   return tab;
 }
@@ -577,7 +573,7 @@ export class MockView3 {}
 export class MockView4 {}
 export class MockView5 {}
 
-export function noop(): any { return 'noop'; };
+export function noop(): any { return 'noop'; }
 
 export function mockModuleLoader(ngModuleLoader?: NgModuleLoader): ModuleLoader {
   ngModuleLoader = ngModuleLoader || mockNgModuleLoader();
@@ -590,9 +586,9 @@ export function mockNgModuleLoader(): NgModuleLoader {
 
 export function mockOverlay() {
   return {
-    present: (opts?: NavOptions) => { return Promise.resolve(); },
-    dismiss: (data?: any, role?: string, navOptions?: NavOptions) => { return Promise.resolve(); },
-    onDidDismiss: (callback: Function) => { },
-    onWillDismiss: (callback: Function) => { }
+    present: (_opts?: NavOptions) => { return Promise.resolve(); },
+    dismiss: (_data?: any, _role?: string, _navOptions?: NavOptions) => { return Promise.resolve(); },
+    onDidDismiss: (_callback: Function) => { },
+    onWillDismiss: (_callback: Function) => { }
   };
 }
diff --git a/src/util/module-loader.ts b/src/util/module-loader.ts
index fcd918cde48..afd4594999b 100644
--- a/src/util/module-loader.ts
+++ b/src/util/module-loader.ts
@@ -68,7 +68,7 @@ export function provideModuleLoader(ngModuleLoader: NgModuleLoader, injector: In
 export interface LoadedModule {
   componentFactoryResolver: ComponentFactoryResolver;
   component: Type<any>;
-};
+}
 
 
 /**
diff --git a/src/util/scroll-view.ts b/src/util/scroll-view.ts
index 414a604abe4..985cd02f142 100644
--- a/src/util/scroll-view.ts
+++ b/src/util/scroll-view.ts
@@ -1,8 +1,8 @@
 
 import { assert } from './util';
 import { App } from '../components/app/app';
-import { DomController, DomCallback } from '../platform/dom-controller';
-import { Platform, EventListenerOptions } from '../platform/platform';
+import { DomCallback, DomController } from '../platform/dom-controller';
+import { EventListenerOptions, Platform } from '../platform/platform';
 import { pointerCoord } from './dom';
 
 
@@ -68,6 +68,20 @@ export class ScrollView {
     this._eventsEnabled = true;
   }
 
+  setScrolling(isScrolling: boolean, ev: ScrollEvent) {
+    if (this.isScrolling) {
+      if (isScrolling) {
+        this.onScroll && this.onScroll(ev);
+      } else {
+        this.isScrolling = false;
+        this.onScrollEnd && this.onScrollEnd(ev);
+      }
+    } else if (isScrolling) {
+      this.isScrolling = true;
+      this.onScrollStart && this.onScrollStart(ev);
+    }
+  }
+
   private enableNativeScrolling() {
     assert(this.onScrollStart, 'onScrollStart is not defined');
     assert(this.onScroll, 'onScroll is not defined');
@@ -94,6 +108,7 @@ export class ScrollView {
       }
 
       ev.timeStamp = scrollEvent.timeStamp;
+
       // Event.timeStamp is 0 in firefox
       if (!ev.timeStamp) {
         ev.timeStamp = Date.now();
@@ -108,9 +123,6 @@ export class ScrollView {
       ev.scrollLeft = self.getLeft();
 
       if (!self.isScrolling) {
-        // currently not scrolling, so this is a scroll start
-        self.isScrolling = true;
-
         // remember the start positions
         ev.startY = ev.scrollTop;
         ev.startX = ev.scrollLeft;
@@ -119,9 +131,6 @@ export class ScrollView {
         ev.velocityY = ev.velocityX = 0;
         ev.deltaY = ev.deltaX = 0;
         positions.length = 0;
-
-        // emit only on the first scroll event
-        self.onScrollStart(ev);
       }
 
       // actively scrolling
@@ -157,25 +166,22 @@ export class ScrollView {
       }
 
       function scrollEnd() {
-        // haven't scrolled in a while, so it's a scrollend
-        self.isScrolling = false;
-
         // reset velocity, do not reset the directions or deltas
         ev.velocityY = ev.velocityX = 0;
 
         // emit that the scroll has ended
-        self.onScrollEnd(ev);
+        self.setScrolling(false, ev);
 
         self._endTmr = null;
       }
 
       // emit on each scroll event
-      self.onScroll(ev);
+      self.setScrolling(true, ev);
 
       // debounce for a moment after the last scroll event
       self._dom.cancel(self._endTmr);
       self._endTmr = self._dom.read(scrollEnd, SCROLL_END_DEBOUNCE_MS);
-    };
+    }
 
     // clear out any existing listeners (just to be safe)
     self._lsn && self._lsn();
@@ -219,7 +225,7 @@ export class ScrollView {
         // ******** DOM READ ****************
         max = ele.scrollHeight - ele.parentElement.offsetHeight + contentTop + contentBottom;
       }
-    };
+    }
 
     function jsScrollDecelerate(timeStamp: number) {
       ev.timeStamp = timeStamp;
@@ -467,7 +473,7 @@ export class ScrollView {
       attempts++;
 
       if (!self._el || stopScroll || attempts > maxAttempts) {
-        self.isScrolling = false;
+        self.setScrolling(false, null);
         (<any>el.style)[transform] = '';
         done();
         return;
@@ -494,13 +500,14 @@ export class ScrollView {
 
       } else {
         stopScroll = true;
-        self.isScrolling = false;
+        self.setScrolling(false, null);
         (<any>el.style)[transform] = '';
         done();
       }
     }
 
     // start scroll loop
+    self.setScrolling(true, null);
     self.isScrolling = true;
 
     // chill out for a frame first
@@ -525,7 +532,7 @@ export class ScrollView {
   }
 
   stop() {
-    this.isScrolling = false;
+    this.setScrolling(false, null);
   }
 
   /**
diff --git a/src/util/test/base-input.spec.ts b/src/util/test/base-input.spec.ts
index 5f6e83c6f70..9470257a4b9 100644
--- a/src/util/test/base-input.spec.ts
+++ b/src/util/test/base-input.spec.ts
@@ -2,8 +2,8 @@
 import { BaseInput } from '../base-input';
 import { Form } from '../form';
 import { Item } from '../../components/item/item';
-import { commonInputTest, ANY_CORPUS } from '../input-tester';
-import { mockConfig, mockPlatform, mockElementRef, mockRenderer, mockForm } from '../mock-providers';
+import { ANY_CORPUS, commonInputTest } from '../input-tester';
+import { mockConfig, mockElementRef, mockForm, mockPlatform, mockRenderer } from '../mock-providers';
 
 let platform: any;
 let config: any;
diff --git a/src/util/test/mock-providers.spec.ts b/src/util/test/mock-providers.spec.ts
index 9661ef4e7a6..30af703bcd7 100644
--- a/src/util/test/mock-providers.spec.ts
+++ b/src/util/test/mock-providers.spec.ts
@@ -1,6 +1,5 @@
-import { mockPlatform, MockPlatform } from '../mock-providers';
-import { mockDomController, MockDomController } from '../mock-providers';
-
+import { MockPlatform, mockPlatform } from '../mock-providers';
+import { MockDomController, mockDomController } from '../mock-providers';
 
 describe('mock-providers', () => {
 
diff --git a/src/util/test/module-loader.spec.ts b/src/util/test/module-loader.spec.ts
index a8d8aba8975..c7dbb4ae8c5 100644
--- a/src/util/test/module-loader.spec.ts
+++ b/src/util/test/module-loader.spec.ts
@@ -1,5 +1,5 @@
-import { ModuleLoader, LAZY_LOADED_TOKEN, setupPreloadingImplementation } from '../module-loader';
-import { mockModuleLoader, mockNgModuleLoader, mockConfig } from '../mock-providers';
+import { LAZY_LOADED_TOKEN, ModuleLoader, setupPreloadingImplementation } from '../module-loader';
+import { mockConfig, mockModuleLoader, mockNgModuleLoader } from '../mock-providers';
 import { NgModuleLoader } from '../ng-module-loader';
 import { Config } from '../../config/config';
 import { DeepLinkConfig } from '../../navigation/nav-util';
@@ -121,7 +121,7 @@ describe('module-loader', () => {
 
     it('should return a promise', (done: Function) => {
       let promise = setupPreloadingImplementation(config, null, moduleLoader);
-      promise.then((response) => {
+      promise.then(() => {
         done();
       }).catch((err: Error) => {
         fail(err);
@@ -137,7 +137,7 @@ describe('module-loader', () => {
         links: []
       };
       let promise = setupPreloadingImplementation(config, deepLinkConfig, moduleLoader);
-      promise.then((response) => {
+      promise.then(() => {
         expect(moduleLoader.load).not.toHaveBeenCalled();
         done();
       }).catch((err: Error) => {
@@ -151,7 +151,7 @@ describe('module-loader', () => {
 
       config.set('preloadModules', true);
       let promise = setupPreloadingImplementation(config, null, moduleLoader);
-      promise.then((response) => {
+      promise.then(() => {
         expect(moduleLoader.load).not.toHaveBeenCalled();
         done();
       }).catch((err: Error) => {
@@ -171,7 +171,7 @@ describe('module-loader', () => {
         }]
       };
       let promise = setupPreloadingImplementation(config, deepLinkConfig, moduleLoader);
-      promise.then((response) => {
+      promise.then(() => {
         expect(moduleLoader.load).not.toHaveBeenCalled();
         done();
       }).catch((err: Error) => {
@@ -191,7 +191,7 @@ describe('module-loader', () => {
         }]
       };
       let promise = setupPreloadingImplementation(config, deepLinkConfig, moduleLoader);
-      promise.then((response) => {
+      promise.then(() => {
         expect(moduleLoader.load).toHaveBeenCalledWith('lowString');
         done();
       }).catch((err: Error) => {
@@ -211,7 +211,7 @@ describe('module-loader', () => {
         }]
       };
       let promise = setupPreloadingImplementation(config, deepLinkConfig, moduleLoader);
-      promise.then((response) => {
+      promise.then(() => {
         expect(moduleLoader.load).toHaveBeenCalledWith('highString');
         done();
       }).catch((err: Error) => {
diff --git a/src/util/util.ts b/src/util/util.ts
index a8d3b46bb2f..ad6bbe72568 100644
--- a/src/util/util.ts
+++ b/src/util/util.ts
@@ -67,7 +67,7 @@ export function normalizeURL(url: string): string {
  * the first object.
  * @param {any} dest the destination to apply defaults to.
  */
-export function defaults(dest: any, ...args: any[]) {
+export function defaults(dest: any, ..._args: any[]) {
   for (var i = arguments.length - 1; i >= 1; i--) {
     var source = arguments[i];
     if (source) {
@@ -101,14 +101,14 @@ export function isBlank(val: any): val is null { return val === undefined || val
 /** @hidden */
 export function isObject(val: any): val is Object { return typeof val === 'object'; }
 /** @hidden */
-export function isArray(val: any): val is any[] { return Array.isArray(val); };
+export function isArray(val: any): val is any[] { return Array.isArray(val); }
 
 
 
 /** @hidden */
 export function isPrimitive(val: any) {
   return isString(val) || isBoolean(val) || (isNumber(val) && !isNaN(val));
-};
+}
 
 
 /** @hidden */
@@ -118,7 +118,7 @@ export function isTrueProperty(val: any): boolean {
     return (val === 'true' || val === 'on' || val === '');
   }
   return !!val;
-};
+}
 
 
 /** @hidden */
@@ -138,7 +138,7 @@ export function isCheckedProperty(a: any, b: any): boolean {
 
   // not using strict comparison on purpose
   return (a == b); // tslint:disable-line
-};
+}
 
 /** @hidden */
 export type Side = 'left' | 'right' | 'start' | 'end';
diff --git a/tsconfig.json b/tsconfig.json
index b7c5bb3a2c8..8ac92f6a39d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,12 +8,15 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "noImplicitAny": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "outDir": "dist/tmp",
     "removeComments": false,
     "sourceMap": true,
     "target": "es2015",
     "typeRoots": [
       "./node_modules/@types"
-    ],    
+    ],
     "types": ["jasmine", "systemjs"]
   },
   "include": [
@@ -27,6 +30,7 @@
   },
   "angularCompilerOptions": {
     "annotationsAs": "static fields",
-    "annotateForClosureCompiler": true
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true
   }
 }
\ No newline at end of file