diff --git a/.gitignore b/.gitignore
index bba9a5959..c24ace581 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,8 @@ build/Release
 
 # Users Environment Variables
 .lock-wscript
+yarn.lock
+yarn-error.log
 
 # OS generated files #
 .DS_Store
diff --git a/package.json b/package.json
index 2f9e82aa2..b1ba07b44 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "@angular/compiler-cli": "^2.3.1",
     "@angular/forms": "^2.3.1",
     "@angular/http": "^2.3.1",
-    "@angular/material": "2.0.0-beta.0",
+    "@angular/material": "^2.0.0-beta.2",
     "@angular/platform-server": "^2.3.1",
     "@angular/router": "~3.1.1",
     "@angular/tsc-wrapped": "~0.4.0",
diff --git a/src/demo-app/app/demo-app/demo-app.css b/src/demo-app/app/demo-app/demo-app.css
index a9dc65339..f50435162 100644
--- a/src/demo-app/app/demo-app/demo-app.css
+++ b/src/demo-app/app/demo-app/demo-app.css
@@ -42,15 +42,15 @@ div.coloredContainerX > div, div.colorNested > div > div {
   text-align: center;
 }
 
-div.coloredContainerX > div:nth-child(1), div.colorNested > div > div:nth-child(1) {
+div.coloredContainerX > div:nth-child(1), div.colorNested > div > div:nth-child(1), div.box1 {
   background-color: #009688;
 }
 
-div.coloredContainerX > div:nth-child(2), div.colorNested > div > div:nth-child(2) {
+div.coloredContainerX > div:nth-child(2), div.colorNested > div > div:nth-child(2), div.box2 {
   background-color: #3949ab;
 }
 
-div.coloredContainerX > div:nth-child(3), div.coloredChildren > div:nth-child(3), div.colorNested > div > div:nth-child(3) {
+div.coloredContainerX > div:nth-child(3), div.coloredChildren > div:nth-child(3), div.colorNested > div > div:nth-child(3), div.box3 {
   background-color: #9c27b0;
 }
 
@@ -224,3 +224,5 @@ md-card-content pre {
 .fxClass-lg2 {
   text-shadow: #5c5c5c;
 }
+
+.fixed { height:275px; }
diff --git a/src/demo-app/app/github-issues/DemosGithubIssues.ts b/src/demo-app/app/github-issues/DemosGithubIssues.ts
index a10379462..a6b635e4d 100644
--- a/src/demo-app/app/github-issues/DemosGithubIssues.ts
+++ b/src/demo-app/app/github-issues/DemosGithubIssues.ts
@@ -1,32 +1,37 @@
 import {Component} from '@angular/core';
 
 @Component({
-    selector: 'demos-github-issues',
-    template: `
+  selector: 'demos-github-issues',
+  template: `
         <demo-issue-5345></demo-issue-5345>
         <demo-issue-9897></demo-issue-9897>
+        <demo-issue-181></demo-issue-181>
     `
 })
-export class DemosGithubIssues { }
+export class DemosGithubIssues {
+}
 
 import {NgModule}            from '@angular/core';
 import {CommonModule}        from "@angular/common";
 import {MaterialModule}      from "@angular/material";
 import {FlexLayoutModule}    from "../../../lib";     // `gulp build:components` to deploy to node_modules manually
 
-import { DemoIssue5345 }     from "./issue.5345.demo";
-import { DemoIssue9897 }     from "./issue.9897.demo";
+import {DemoIssue5345}     from "./issue.5345.demo";
+import {DemoIssue9897}     from "./issue.9897.demo";
+import {DemoIssue181}        from './issue.181.demo';
 
 @NgModule({
-  declarations : [
+  declarations: [
     DemosGithubIssues,      // used by the Router with the root app component
     DemoIssue5345,
-    DemoIssue9897
+    DemoIssue9897,
+    DemoIssue181
   ],
-  imports : [
+  imports: [
     CommonModule,
     MaterialModule,
     FlexLayoutModule
   ]
 })
-export class DemosGithubIssuesModule{ }
+export class DemosGithubIssuesModule {
+}
diff --git a/src/demo-app/app/github-issues/issue.181.demo.ts b/src/demo-app/app/github-issues/issue.181.demo.ts
new file mode 100644
index 000000000..19d6e4e18
--- /dev/null
+++ b/src/demo-app/app/github-issues/issue.181.demo.ts
@@ -0,0 +1,58 @@
+import {Component, OnDestroy} from '@angular/core';
+import {Subscription} from "rxjs/Subscription";
+import 'rxjs/add/operator/filter';
+
+import {MediaChange} from "../../../lib/media-query/media-change";
+import {ObservableMedia} from "../../../lib/media-query/observable-media-service";
+
+@Component({
+  selector: 'demo-issue-181',
+  styleUrls: [
+    '../demo-app/material2.css'
+  ],
+  template: `
+    <md-card class="card-demo" > 
+      <md-card-title><a href="https://github.com/angular/flex-layout/issues/181" target="_blank">Issue #181</a></md-card-title>
+      <md-card-subtitle>Wrong layout when fxHide + fxShow usages do not cooperate properly:</md-card-subtitle>
+      <md-card-content>                                                                                     
+        <div class="containerX">
+          <div class="coloredContainerX box fixed"
+               [fxLayout]="direction" 
+               (click)="pivot()">
+              <div fxHide fxShow.gt-xs class="box1"> Type 1, row a, fxHide fxShow.gt-xs </div>
+            	<div fxHide fxShow.gt-xs class="box2"> Type 1, row b, fxHide fxShow.gt-xs </div>
+            	<div fxHide fxShow.gt-xs class="box3"> Type 1, row c, fxHide fxShow.gt-xs </div>
+            	
+            	<div fxShow fxHide.md class="box1"> Type 2, row a, fxShow fxHide.md</div>
+            	<div fxShow fxHide.md class="box2"> Type 2, row b, fxShow fxHide.md</div>
+            	<div fxShow fxHide.md class="box3"> Type 2, row c, fxShow fxHide.md</div>
+          </div>       
+        </div>
+      </md-card-content>
+      <md-card-footer style="width:95%;padding-left:20px;margin-top:-5px;">
+        <div class="hint" >Active mediaQuery: <span style="padding-left: 20px; color: rgba(0, 0, 0, 0.54)">{{  activeMediaQuery }}</span></div>
+      </md-card-footer>      
+    </md-card>
+  `
+})
+export class DemoIssue181 implements OnDestroy {
+  public direction = "column";
+  public activeMediaQuery = "";
+
+  constructor(media$: ObservableMedia) {
+    this._watcher = media$.subscribe((change: MediaChange) => {
+      let value = change ? `'${change.mqAlias}' = (${change.mediaQuery})` : "";
+      this.activeMediaQuery = value;
+    });
+  }
+
+  pivot() {
+    this.direction = (this.direction === "row") ? "column" : "row";
+  }
+
+  ngOnDestroy() {
+    this._watcher.unsubscribe();
+  }
+
+  private _watcher: Subscription;
+}
diff --git a/src/lib/flexbox/_module.ts b/src/lib/flexbox/_module.ts
index 552d7a25b..1bd18efe6 100644
--- a/src/lib/flexbox/_module.ts
+++ b/src/lib/flexbox/_module.ts
@@ -14,8 +14,7 @@ import {MediaQueriesModule} from '../media-query/_module';
 
 import {FlexDirective} from './api/flex';
 import {LayoutDirective} from './api/layout';
-import {HideDirective} from './api/hide';
-import {ShowDirective} from './api/show';
+import {ShowHideDirective} from './api/show-hide';
 import {FlexAlignDirective} from './api/flex-align';
 import {FlexFillDirective} from './api/flex-fill';
 import {FlexOffsetDirective} from './api/flex-offset';
@@ -44,8 +43,7 @@ const ALL_DIRECTIVES = [
   FlexOffsetDirective,
   FlexFillDirective,
   FlexAlignDirective,
-  ShowDirective,
-  HideDirective,
+  ShowHideDirective,
   ClassDirective,
   StyleDirective,
 ];
diff --git a/src/lib/flexbox/api/base-adapter.ts b/src/lib/flexbox/api/base-adapter.ts
index b853c2a65..73c6340da 100644
--- a/src/lib/flexbox/api/base-adapter.ts
+++ b/src/lib/flexbox/api/base-adapter.ts
@@ -17,6 +17,7 @@ export class BaseFxDirectiveAdapter extends BaseFxDirective {
   get mqActivation(): ResponsiveActivation {
     return this._mqActivation;
   }
+
   /**
    * @see BaseFxDirective._queryInput
    */
@@ -28,7 +29,7 @@ export class BaseFxDirectiveAdapter extends BaseFxDirective {
    *  Save the property value.
    */
   cacheInput(key?: string, source?: any, cacheRaw = false) {
-    if ( cacheRaw ) {
+    if (cacheRaw) {
       this._cacheInputRaw(key, source);
     } else if (Array.isArray(source)) {
       this._cacheInputArray(key, source);
diff --git a/src/lib/flexbox/api/base.ts b/src/lib/flexbox/api/base.ts
index 18444242f..e5a538176 100644
--- a/src/lib/flexbox/api/base.ts
+++ b/src/lib/flexbox/api/base.ts
@@ -20,7 +20,7 @@ import {MediaQuerySubscriber} from '../../media-query/media-change';
  * Definition of a css style. Either a property name (e.g. "flex-basis") or an object
  * map of property name and value (e.g. {display: 'none', flex-order: 5}).
  */
-export type StyleDefinition = string|{ [property: string]: string|number };
+export type StyleDefinition = string|{[property: string]: string|number};
 
 /** Abstract base class for the Layout API styling directives. */
 export abstract class BaseFxDirective implements OnDestroy {
diff --git a/src/lib/flexbox/api/hide.spec.ts b/src/lib/flexbox/api/hide.spec.ts
index 7f0014535..e099f16a8 100644
--- a/src/lib/flexbox/api/hide.spec.ts
+++ b/src/lib/flexbox/api/hide.spec.ts
@@ -21,7 +21,7 @@ import {customMatchers, expect, NgMatchers} from '../../utils/testing/custom-mat
 import {
   makeCreateTestComponent, expectNativeEl, queryFor
 } from '../../utils/testing/helpers';
-import {HideDirective} from './hide';
+import {ShowHideDirective} from './show-hide';
 import {MediaQueriesModule} from '../../media-query/_module';
 
 describe('hide directive', () => {
@@ -52,7 +52,7 @@ describe('hide directive', () => {
     // Configure testbed to prepare services
     TestBed.configureTestingModule({
       imports: [CommonModule, MediaQueriesModule],
-      declarations: [TestHideComponent, HideDirective],
+      declarations: [TestHideComponent, ShowHideDirective],
       providers: [
         BreakPointRegistry, BreakPointsProvider,
         {provide: MatchMedia, useClass: MockMatchMedia}
diff --git a/src/lib/flexbox/api/hide.ts b/src/lib/flexbox/api/hide.ts
deleted file mode 100644
index b1a601412..000000000
--- a/src/lib/flexbox/api/hide.ts
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import {
-  Directive,
-  ElementRef,
-  Input,
-  OnInit,
-  OnChanges,
-  OnDestroy,
-  Renderer,
-  SimpleChanges,
-  Self,
-  Optional
-} from '@angular/core';
-
-import {Subscription} from 'rxjs/Subscription';
-
-import {BaseFxDirective} from './base';
-import {MediaChange} from '../../media-query/media-change';
-import {MediaMonitor} from '../../media-query/media-monitor';
-
-import {LayoutDirective} from './layout';
-
-/**
- * 'show' Layout API directive
- *
- */
-@Directive({
-  selector: `
-  [fxHide],
-  [fxHide.xs],
-  [fxHide.gt-xs],
-  [fxHide.sm],
-  [fxHide.gt-sm],
-  [fxHide.md],
-  [fxHide.gt-md],
-  [fxHide.lg],
-  [fxHide.gt-lg],
-  [fxHide.xl]
-`
-})
-export class HideDirective extends BaseFxDirective implements OnInit, OnChanges, OnDestroy {
-
-  /**
-   * Subscription to the parent flex container's layout changes.
-   * Stored so we can unsubscribe when this directive is destroyed.
-   */
-  protected _layoutWatcher: Subscription;
-
-  @Input('fxHide')       set hide(val) {
-    this._cacheInput("hide", val);
-  }
-
-  @Input('fxHide.xs')    set hideXs(val) {
-    this._cacheInput('hideXs', val);
-  }
-
-  @Input('fxHide.gt-xs') set hideGtXs(val) {
-    this._cacheInput('hideGtXs', val);
-  };
-
-  @Input('fxHide.sm')    set hideSm(val) {
-    this._cacheInput('hideSm', val);
-  };
-
-  @Input('fxHide.gt-sm') set hideGtSm(val) {
-    this._cacheInput('hideGtSm', val);
-  };
-
-  @Input('fxHide.md')    set hideMd(val) {
-    this._cacheInput('hideMd', val);
-  };
-
-  @Input('fxHide.gt-md') set hideGtMd(val) {
-    this._cacheInput('hideGtMd', val);
-  };
-
-  @Input('fxHide.lg')    set hideLg(val) {
-    this._cacheInput('hideLg', val);
-  };
-
-  @Input('fxHide.gt-lg') set hideGtLg(val) {
-    this._cacheInput('hideGtLg', val);
-  };
-
-  @Input('fxHide.xl')    set hideXl(val) {
-    this._cacheInput('hideXl', val);
-  };
-
-  /**
-   *
-   */
-  constructor(monitor: MediaMonitor,
-              @Optional() @Self() protected _layout: LayoutDirective,
-              protected elRef: ElementRef,
-              protected renderer: Renderer) {
-    super(monitor, elRef, renderer);
-
-    /**
-     * The Layout can set the display:flex (and incorrectly affect the Hide/Show directives.
-     * Whenever Layout [on the same element] resets its CSS, then update the Hide/Show CSS
-     */
-    if (_layout) {
-      this._layoutWatcher = _layout.layout$.subscribe(() => this._updateWithValue());
-    }
-    this._display = this._getDisplayStyle(); // re-invoke override to use `this._layout`
-  }
-
-
-  // *********************************************
-  // Lifecycle Methods
-  // *********************************************
-
-  /**
-   * Override accessor to the current HTMLElement's `display` style
-   * Note: Show/Hide will not change the display to 'flex' but will set it to 'block'
-   * unless it was already explicitly defined.
-   */
-  protected _getDisplayStyle(): string {
-    return this._layout ? "flex" : super._getDisplayStyle();
-  }
-
-  /**
-   * On changes to any @Input properties...
-   * Default to use the non-responsive Input value ('fxHide')
-   * Then conditionally override with the mq-activated Input's current value
-   */
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes['hide'] != null || this._mqActivation) {
-      this._updateWithValue();
-    }
-  }
-
-  /**
-   * After the initial onChanges, build an mqActivation object that bridges
-   * mql change events to onMediaQueryChange handlers
-   * NOTE: fxHide has special fallback defaults.
-   *       - If the non-responsive fxHide="" is specified we default to hide==true
-   *       - If the non-responsive fxHide is NOT specified, use default hide == false
-   *       This logic supports mixed usages with fxShow; e.g. `<div fxHide fxShow.gt-sm>`
-   */
-  ngOnInit() {
-    // If the attribute 'fxHide' is specified we default to hide==true, otherwise do nothing..
-    let value = (this._queryInput('hide') == "") ? true : this._getDefaultVal("hide", false);
-
-    this._listenForMediaQueryChanges('hide', value, (changes: MediaChange) => {
-      this._updateWithValue(changes.value);
-    });
-    this._updateWithValue();
-  }
-
-
-  ngOnDestroy() {
-    super.ngOnDestroy();
-    if (this._layoutWatcher) {
-      this._layoutWatcher.unsubscribe();
-    }
-  }
-
-  // *********************************************
-  // Protected methods
-  // *********************************************
-
-  /**
-   * Validate the visibility value and then update the host's inline display style
-   */
-  protected _updateWithValue(value?: string|number|boolean) {
-    value = value || this._getDefaultVal("hide", false);
-    if (this._mqActivation) {
-      value = this._mqActivation.activatedInput;
-    }
-
-    let shouldHide = this._validateTruthy(value);
-    this._applyStyleToElement(this._buildCSS(shouldHide));
-  }
-
-
-  /**
-   * Build the CSS that should be assigned to the element instance
-   */
-  protected _buildCSS(value) {
-    return {'display': value ? 'none' : this._display};
-  }
-
-  /**
-   * Validate the value to NOT be FALSY
-   */
-  protected _validateTruthy(value) {
-    return FALSY.indexOf(value) === -1;
-  }
-}
-
-
-const FALSY = ['false', false, 0];
-
diff --git a/src/lib/flexbox/api/show.ts b/src/lib/flexbox/api/show-hide.ts
similarity index 72%
rename from src/lib/flexbox/api/show.ts
rename to src/lib/flexbox/api/show-hide.ts
index 2dffe76c6..ec6e15bf6 100644
--- a/src/lib/flexbox/api/show.ts
+++ b/src/lib/flexbox/api/show-hide.ts
@@ -23,13 +23,21 @@ import {Subscription} from 'rxjs/Subscription';
 import {BaseFxDirective} from './base';
 import {MediaChange} from '../../media-query/media-change';
 import {MediaMonitor} from '../../media-query/media-monitor';
-
 import {LayoutDirective} from './layout';
-import {HideDirective} from './hide';
-
 
 const FALSY = ['false', false, 0];
 
+/**
+ * For fxHide selectors, we invert the 'value'
+ * and assign to the equivalent fxShow selector cache
+ */
+export function negativeOf(hide: any) {
+  // where 'hide' === '', do NOT show the element
+  // where 'hide' === false or 0... we WILL show the element
+  return (hide === "") ? false :
+         ((hide === "false") || (hide === 0)) ? true : !hide;
+}
+
 /**
  * 'show' Layout API directive
  *
@@ -45,10 +53,20 @@ const FALSY = ['false', false, 0];
   [fxShow.gt-md],
   [fxShow.lg],
   [fxShow.gt-lg],
-  [fxShow.xl]
+  [fxShow.xl],
+  [fxHide],
+  [fxHide.xs],
+  [fxHide.gt-xs],
+  [fxHide.sm],
+  [fxHide.gt-sm],
+  [fxHide.md],
+  [fxHide.gt-md],
+  [fxHide.lg],
+  [fxHide.gt-lg],
+  [fxHide.xl]  
 `
 })
-export class ShowDirective extends BaseFxDirective implements OnInit, OnChanges, OnDestroy {
+export class ShowHideDirective extends BaseFxDirective implements OnInit, OnChanges, OnDestroy {
 
   /**
    * Subscription to the parent flex container's layout changes.
@@ -56,52 +74,92 @@ export class ShowDirective extends BaseFxDirective implements OnInit, OnChanges,
    */
   protected _layoutWatcher: Subscription;
 
+
   @Input('fxShow')       set show(val) {
     this._cacheInput("show", val);
   }
 
+  @Input('fxHide')       set hide(val) {
+    this._cacheInput("show", negativeOf(val));
+  }
+
   @Input('fxShow.xs')    set showXs(val) {
     this._cacheInput('showXs', val);
   }
 
+  @Input('fxHide.xs')    set hideXs(val) {
+    this._cacheInput("showXs", negativeOf(val));
+  }
+
   @Input('fxShow.gt-xs') set showGtXs(val) {
     this._cacheInput('showGtXs', val);
   };
 
+  @Input('fxHide.gt-xs') set hideGtXs(val) {
+    this._cacheInput('showGtXs', negativeOf(val));
+  };
+
   @Input('fxShow.sm')    set showSm(val) {
     this._cacheInput('showSm', val);
   };
 
+  @Input('fxHide.sm')    set hideSm(val) {
+    this._cacheInput('showSm', negativeOf(val));
+  };
+
   @Input('fxShow.gt-sm') set showGtSm(val) {
     this._cacheInput('showGtSm', val);
   };
 
+  @Input('fxHide.gt-sm') set hideGtSm(val) {
+    this._cacheInput('showGtSm', negativeOf(val));
+  };
+
   @Input('fxShow.md')    set showMd(val) {
     this._cacheInput('showMd', val);
   };
 
+  @Input('fxHide.md')    set hideMd(val) {
+    this._cacheInput('showMd', negativeOf(val));
+  };
+
   @Input('fxShow.gt-md') set showGtMd(val) {
     this._cacheInput('showGtMd', val);
   };
 
+  @Input('fxHide.gt-md') set hideGtMd(val) {
+    this._cacheInput('showGtMd', negativeOf(val));
+  };
+
   @Input('fxShow.lg')    set showLg(val) {
     this._cacheInput('showLg', val);
   };
 
+  @Input('fxHide.lg')    set hideLg(val) {
+    this._cacheInput('showLg', negativeOf(val));
+  };
+
   @Input('fxShow.gt-lg') set showGtLg(val) {
     this._cacheInput('showGtLg', val);
   };
 
+  @Input('fxHide.gt-lg') set hideGtLg(val) {
+    this._cacheInput('showGtLg', negativeOf(val));
+  };
+
   @Input('fxShow.xl')    set showXl(val) {
     this._cacheInput('showXl', val);
   };
 
+  @Input('fxHide.xl')    set hideXl(val) {
+    this._cacheInput('showXl', negativeOf(val));
+  };
+
   /**
    *
    */
   constructor(monitor: MediaMonitor,
               @Optional() @Self() protected _layout: LayoutDirective,
-              @Optional() @Self() protected _hide: HideDirective,
               protected elRef: ElementRef,
               protected renderer: Renderer) {
 
@@ -127,8 +185,7 @@ export class ShowDirective extends BaseFxDirective implements OnInit, OnChanges,
    * unless it was already explicitly defined.
    */
   protected _getDisplayStyle(): string {
-    let element: HTMLElement = this._elementRef.nativeElement;
-    return (element.style as any)['display'] || (this._layout ? "flex" : "block");
+    return this._layout ? "flex" : super._getDisplayStyle();
   }
 
 
@@ -152,14 +209,10 @@ export class ShowDirective extends BaseFxDirective implements OnInit, OnChanges,
 
     // Build _mqActivation controller
     this._listenForMediaQueryChanges('show', value, (changes: MediaChange) => {
-      if (!this._delegateToHide(changes)) {
-        this._updateWithValue(changes.value);
-      }
+      this._updateWithValue(changes.value);
     });
 
-    if (!this._delegateToHide()) {
-      this._updateWithValue();
-    }
+    this._updateWithValue();
   }
 
   ngOnDestroy() {
@@ -173,21 +226,6 @@ export class ShowDirective extends BaseFxDirective implements OnInit, OnChanges,
   // Protected methods
   // *********************************************
 
-  /**
-   * If deactiving Show, then delegate action to the Hide directive if it is
-   * specified on same element.
-   */
-  protected _delegateToHide(changes?: MediaChange) {
-    if (this._hide) {
-      let delegate = (changes && !changes.matches) || (!changes && !this.hasKeyValue('show'));
-      if (delegate) {
-        this._hide.ngOnChanges({});
-        return true;
-      }
-    }
-    return false;
-  }
-
   /** Validate the visibility value and then update the host's inline display style */
   protected _updateWithValue(value?: string|number|boolean) {
     value = value || this._getDefaultVal("show", true);
diff --git a/src/lib/flexbox/api/show.spec.ts b/src/lib/flexbox/api/show.spec.ts
index 3031e026a..d6622e19b 100644
--- a/src/lib/flexbox/api/show.spec.ts
+++ b/src/lib/flexbox/api/show.spec.ts
@@ -99,7 +99,7 @@ describe('show directive', () => {
           ...content
         </button>
       `);
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'block'});
+      expectNativeEl(fixture).toHaveCssStyle({'display': 'inline-block'});
     });
 
     it('should use "flex" display style when the element also has an fxLayout', () => {
diff --git a/src/lib/flexbox/index.ts b/src/lib/flexbox/index.ts
index af4ffbaaf..103ef8353 100644
--- a/src/lib/flexbox/index.ts
+++ b/src/lib/flexbox/index.ts
@@ -6,5 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 export * from './api/base';
+export * from './api/base-adapter';
 export * from './responsive/responsive-activation';
 export * from './_module';
diff --git a/yarn.lock b/yarn.lock
index 525045808..8664c00e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,51 +2,49 @@
 # yarn lockfile v1
 
 
-"@angular/common@^2.2.3":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-2.4.4.tgz#039520c6395476d7f35ca250973dfef946c62831"
+"@angular/common@^2.3.1":
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-2.4.7.tgz#9316daf90e353e67187d2e0afec5521c2001bd4b"
 
-"@angular/compiler-cli@^2.2.3":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-2.4.4.tgz#726598f850e599677fa1638d1728096384665a63"
+"@angular/compiler-cli@^2.3.1":
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-2.4.7.tgz#15768141816903636593f430ff9a808d98a2a762"
   dependencies:
-    "@angular/tsc-wrapped" "0.5.1"
+    "@angular/tsc-wrapped" "0.5.2"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
 
-"@angular/compiler@^2.2.3":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-2.4.4.tgz#86b861685ebc4c7b19b1133bf8c5bf4d28c71475"
+"@angular/compiler@^2.3.1":
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-2.4.7.tgz#008c1f0d1409c46fbba215fe8ab0d886252c7ff0"
 
-"@angular/core@^2.2.3":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.4.4.tgz#eafef7bbdefea321fa5e79998bb2f6707c70729d"
+"@angular/core@^2.3.1":
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.4.7.tgz#8bed9a2d37e81342bd41d189df88aa3e02393cfb"
 
-"@angular/forms@^2.2.3":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-2.4.4.tgz#9679ca369d5bc2968ee1a67634ac221d75487364"
+"@angular/forms@^2.3.1":
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-2.4.7.tgz#d34a36110e10f641aa1e1420b5c2df65987fd8bb"
 
-"@angular/http@^2.2.3":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-2.4.4.tgz#e41a9808eeec9cfdf3d5f9f92d0041b5c041fd60"
+"@angular/http@^2.3.1":
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-2.4.7.tgz#b024b2b49ae0234258d42309e46f65862a42070d"
 
-"@angular/material@2.0.0-beta.0":
-  version "2.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-2.0.0-beta.0.tgz#74f6dc34ed9703766d5f98f95f5921959adf7c12"
-  dependencies:
-    "@types/hammerjs" "^2.0.30"
+"@angular/material@^2.0.0-beta.2":
+  version "2.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-2.0.0-beta.2.tgz#65ee8733990347b7518b7f42113e02e069dc109b"
 
-"@angular/platform-browser-dynamic@^2.2.3":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.4.4.tgz#b5948cf2cac33c9634a400a7ece8fb5600f83107"
+"@angular/platform-browser-dynamic@^2.3.1":
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.4.7.tgz#9632586f9ce596186be4c124c3ea0a4a74b27b46"
 
-"@angular/platform-browser@^2.2.3":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-2.4.4.tgz#0bff3512d00b199211ff28df0aa5c6841718a19c"
+"@angular/platform-browser@^2.3.1":
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-2.4.7.tgz#19f7996a70f07b34ce8d6d0e255544e62cae75f1"
 
-"@angular/platform-server@^2.2.3":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-2.4.4.tgz#2fc2d0b4ac29c8f08a3702a8da3ab79933b737d0"
+"@angular/platform-server@^2.3.1":
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-2.4.7.tgz#e2a9f283b4eb25b967ab085c83350c0a08927617"
   dependencies:
     parse5 "^2.2.1"
 
@@ -54,9 +52,9 @@
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@angular/router/-/router-3.1.2.tgz#1046c943ace795027e2e5057df8c897da968fcd6"
 
-"@angular/tsc-wrapped@0.5.1":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-0.5.1.tgz#7a69bec999eef41903dddaaccdc862cfcface52c"
+"@angular/tsc-wrapped@0.5.2":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-0.5.2.tgz#2eddf472c467fcb334ea94deddaaa71990c5a482"
   dependencies:
     tsickle "^0.2"
 
@@ -72,16 +70,6 @@
   dependencies:
     loader-utils "^0.2.15"
 
-"@angularclass/hmr-loader@~3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@angularclass/hmr-loader/-/hmr-loader-3.0.2.tgz#c789182411f09d0b98929e6acbfd3e4aeaace597"
-  dependencies:
-    loader-utils "^0.2.15"
-
-"@angularclass/hmr@~1.2.0":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-1.2.2.tgz#46a18f89a1e94d05c268b83c9480e005f73fc265"
-
 "@angularclass/request-idle-callback@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@angularclass/request-idle-callback/-/request-idle-callback-1.0.7.tgz#3cb337999f003d870c9f9e4473c932a152f083b8"
@@ -98,12 +86,6 @@
   version "0.9.35"
   resolved "https://registry.yarnpkg.com/@types/core-js/-/core-js-0.9.35.tgz#444064e63711cdcc62ea844d27642f6efc2285f2"
 
-"@types/fs-extra@0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-0.0.33.tgz#a8719c417b080c012d3497b28e228ac09745fdf2"
-  dependencies:
-    "@types/node" "*"
-
 "@types/glob@^5.0.29":
   version "5.0.30"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.30.tgz#1026409c5625a8689074602808d082b2867b8a51"
@@ -128,37 +110,21 @@
     "@types/orchestrator" "*"
     "@types/vinyl" "*"
 
-"@types/hammerjs@^2.0.30", "@types/hammerjs@~2.0.33":
+"@types/hammerjs@~2.0.33":
   version "2.0.34"
   resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.34.tgz#9cbac4f41cb039436141785e1be50b3ab10a04a9"
 
-"@types/handlebars@^4.0.31":
-  version "4.0.31"
-  resolved "https://registry.yarnpkg.com/@types/handlebars/-/handlebars-4.0.31.tgz#a7fba66fafe42713aee88eeca8db91192efe6e72"
-
-"@types/highlight.js@^9.1.8":
-  version "9.1.9"
-  resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.1.9.tgz#ed6336955eaf233b75eb7923b9b1f373d045ef01"
-
 "@types/jasmine@^2.2.34":
   version "2.5.41"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.5.41.tgz#d5e86161a0af80d52062b310a33ed65b051a0713"
 
-"@types/lodash@^4.14.37":
-  version "4.14.50"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.50.tgz#2227da4d65fafe249bccd59c7b9396e27674c8f7"
-
-"@types/marked@0.0.28":
-  version "0.0.28"
-  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.0.28.tgz#44ba754e9fa51432583e8eb30a7c4dd249b52faa"
-
 "@types/merge2@0.0.28":
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/@types/merge2/-/merge2-0.0.28.tgz#bd8dcba0e963879445ea5df1b7f9ea1406f2f341"
   dependencies:
     "@types/node" "4.0.*"
 
-"@types/minimatch@*", "@types/minimatch@^2.0.29":
+"@types/minimatch@*":
   version "2.0.29"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-2.0.29.tgz#5002e14f75e2d71e564281df0431c8c1b4a2a36a"
 
@@ -180,12 +146,6 @@
   dependencies:
     "@types/q" "*"
 
-"@types/protractor@^1.5.20":
-  version "1.5.20"
-  resolved "https://registry.yarnpkg.com/@types/protractor/-/protractor-1.5.20.tgz#7437e94b89af90d507eec9b9261a81a69a367300"
-  dependencies:
-    "@types/selenium-webdriver" "*"
-
 "@types/q@*":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
@@ -201,16 +161,6 @@
   version "2.5.34"
   resolved "https://registry.yarnpkg.com/@types/rx/-/rx-2.5.34.tgz#361a94a547905c5ac06c10f3b7c68a916341dd71"
 
-"@types/selenium-webdriver@*", "@types/selenium-webdriver@2.44.29":
-  version "2.44.29"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.44.29.tgz#5be245a74e9aa3336429ab853e93ddbdce86a717"
-
-"@types/shelljs@^0.3.32":
-  version "0.3.33"
-  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.3.33.tgz#df613bddb88225ed09ce5c835f620dcaaf155e6b"
-  dependencies:
-    "@types/node" "*"
-
 "@types/source-map@*", "@types/source-map@^0.1.27":
   version "0.1.29"
   resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.1.29.tgz#d7048a60180b09f8aa6d53bda311c6b51cbd7018"
@@ -271,10 +221,6 @@ accepts@~1.0.7:
     mime-types "~1.0.0"
     negotiator "0.4.7"
 
-ace-builds@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.2.5.tgz#41c5360cdee6c43e73735d3e3558121f9fea37a9"
-
 acorn-dynamic-import@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz#23f671eb6e650dab277fef477c321b1178a8cca2"
@@ -589,7 +535,7 @@ aws4@^1.2.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.5.0.tgz#0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"
 
-babel-code-frame@^6.11.0, babel-code-frame@^6.20.0, babel-code-frame@^6.22.0:
+babel-code-frame@^6.11.0, babel-code-frame@^6.20.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
   dependencies:
@@ -597,111 +543,13 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.20.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.18.2, babel-core@^6.22.0:
-  version "6.22.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.22.1.tgz#9c5fd658ba1772d28d721f6d25d968fc7ae21648"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-generator "^6.22.0"
-    babel-helpers "^6.22.0"
-    babel-messages "^6.22.0"
-    babel-register "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-traverse "^6.22.1"
-    babel-types "^6.22.0"
-    babylon "^6.11.0"
-    convert-source-map "^1.1.0"
-    debug "^2.1.1"
-    json5 "^0.5.0"
-    lodash "^4.2.0"
-    minimatch "^3.0.2"
-    path-is-absolute "^1.0.0"
-    private "^0.1.6"
-    slash "^1.0.0"
-    source-map "^0.5.0"
-
-babel-generator@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.22.0.tgz#d642bf4961911a8adc7c692b0c9297f325cda805"
-  dependencies:
-    babel-messages "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
-
-babel-helpers@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.22.0.tgz#d275f55f2252b8101bff07bc0c556deda657392c"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-
-babel-messages@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.22.0.tgz#36066a214f1217e4ed4164867669ecb39e3ea575"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-register@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.22.0.tgz#a61dd83975f9ca4a9e7d6eff3059494cd5ea4c63"
-  dependencies:
-    babel-core "^6.22.0"
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.2.0"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.2"
-
-babel-runtime@^6.0.0, babel-runtime@^6.22.0:
+babel-runtime@^6.0.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.22.0.tgz#403d110905a4626b317a2a1fcb8f3b73204b2edb"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
-    babylon "^6.11.0"
-    lodash "^4.2.0"
-
-babel-traverse@^6.22.0, babel-traverse@^6.22.1:
-  version "6.22.1"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.22.1.tgz#3b95cd6b7427d6f1f757704908f2fc9748a5f59f"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-messages "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-    babylon "^6.15.0"
-    debug "^2.2.0"
-    globals "^9.0.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-babel-types@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.22.0.tgz#2a447e8d0ea25d2512409e4175479fd78cc8b1db"
-  dependencies:
-    babel-runtime "^6.22.0"
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^1.0.1"
-
-babylon@^6.11.0, babylon@^6.15.0:
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
-
 babylon@~6.8.1:
   version "6.8.4"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.8.4.tgz#097306b8dabae95159225cf29b3ea55912053180"
@@ -1082,10 +930,6 @@ chalk@0.5.1, chalk@^0.5.0:
     strip-ansi "^0.3.0"
     supports-color "^0.2.0"
 
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-
 chokidar@^1.4.1, chokidar@^1.4.3, chokidar@^1.6.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
@@ -1538,7 +1382,7 @@ conventional-commits-parser@^1.0.0:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-convert-source-map@1.X, convert-source-map@^1.1.0, convert-source-map@^1.1.1:
+convert-source-map@1.X, convert-source-map@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.3.0.tgz#e9f3e9c6e2728efc2676696a70eb382f73106a67"
 
@@ -1628,10 +1472,6 @@ cross-spawn@^0.2.9:
   dependencies:
     lru-cache "^2.5.0"
 
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -1829,7 +1669,7 @@ debug@1.0.4:
   dependencies:
     ms "0.6.2"
 
-debug@2, debug@2.6.0, debug@2.X, debug@^2.1.1, debug@^2.2.0:
+debug@2, debug@2.6.0, debug@2.X, debug@^2.2.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
   dependencies:
@@ -1919,12 +1759,6 @@ detect-file@^0.1.0:
   dependencies:
     fs-exists-sync "^0.1.0"
 
-detect-indent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  dependencies:
-    repeating "^2.0.0"
-
 detect-newline@2.X:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -2216,10 +2050,6 @@ error-ex@^1.2.0:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-module-loader@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/es-module-loader/-/es-module-loader-1.3.5.tgz#7789f9ffd2a5d9c7386eeee7572c085791257285"
-
 es5-ext@^0.10.7, es5-ext@^0.10.8, es5-ext@~0.10.11, es5-ext@~0.10.2, es5-ext@~0.10.5, es5-ext@~0.10.6, es5-ext@~0.10.7:
   version "0.10.12"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.12.tgz#aa84641d4db76b62abba5e45fd805ecbab140047"
@@ -2680,16 +2510,6 @@ fs-extra@^0.26.4, fs-extra@^0.26.5:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
-fs-extra@^0.30.0:
-  version "0.30.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-    path-is-absolute "^1.0.0"
-    rimraf "^2.2.8"
-
 fs-extra@~0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.6.4.tgz#f46f0c75b7841f8d200b3348cd4d691d5a099d15"
@@ -2980,10 +2800,6 @@ global-prefix@^0.1.4:
     is-windows "^0.2.0"
     which "^1.2.12"
 
-globals@^9.0.0:
-  version "9.14.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034"
-
 globby@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -3165,15 +2981,6 @@ gulp-server-livereload@^1.8.2:
     through2 "~0.5.1"
     vinyl-fs "^1.0.0"
 
-gulp-shell@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/gulp-shell/-/gulp-shell-0.5.2.tgz#a4959ca0651ad1c7bbfe70b2d0adbbb4e1aea98d"
-  dependencies:
-    async "^1.5.0"
-    gulp-util "^3.0.7"
-    lodash "^4.0.0"
-    through2 "^2.0.0"
-
 gulp-sourcemaps@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"
@@ -3306,7 +3113,7 @@ handle-thing@^1.2.4:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
 
-handlebars@4.0.5, handlebars@^4.0.1, handlebars@^4.0.2:
+handlebars@^4.0.1, handlebars@^4.0.2:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.5.tgz#92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"
   dependencies:
@@ -3386,21 +3193,10 @@ he@1.1.x:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.0.tgz#29319d49beec13a9b1f3c4f9b2a6dde4859bb2a7"
 
-highlight.js@^9.0.0:
-  version "9.9.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.9.0.tgz#b9995dcfdc2773e307a34f0460d92b9a474782c0"
-
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
-home-or-tmp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.1"
-
 homedir-polyfill@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
@@ -3546,13 +3342,6 @@ ignore@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.0.tgz#8d88f03c3002a0ac52114db25d2c673b0bf1e435"
 
-imports-loader@^0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.6.5.tgz#ae74653031d59e37b3c2fb2544ac61aeae3530a6"
-  dependencies:
-    loader-utils "0.2.x"
-    source-map "0.1.x"
-
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -3598,12 +3387,6 @@ interpret@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
 
-invariant@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
-  dependencies:
-    loose-envify "^1.0.0"
-
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
@@ -3637,7 +3420,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.0.2, is-buffer@~1.1.1:
+is-buffer@^1.0.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b"
 
@@ -3893,10 +3676,6 @@ jsbn@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd"
 
-jsesc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -3970,9 +3749,9 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.3.6"
 
-karma-browserstack-launcher@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/karma-browserstack-launcher/-/karma-browserstack-launcher-1.1.1.tgz#e15d2fa28636c0ae93fe720583eb19e8648c11fc"
+karma-browserstack-launcher@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/karma-browserstack-launcher/-/karma-browserstack-launcher-1.2.0.tgz#acfa534835ba590041eef009c1169a219120bb5b"
   dependencies:
     browserstack "1.5.0"
     browserstacktunnel-wrapper "~1.4.2"
@@ -3995,10 +3774,6 @@ karma-coverage@^1.1.1:
     minimatch "^3.0.0"
     source-map "^0.5.1"
 
-karma-firefox-launcher@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.0.0.tgz#e08af3ce42e39860c2952ea7b7eaa64d63508bdc"
-
 karma-jasmine@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf"
@@ -4015,11 +3790,7 @@ karma-remap-coverage@^0.1.1:
   dependencies:
     remap-istanbul "0.8.4"
 
-karma-safari-launcher@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz#96982a2cc47d066aae71c553babb28319115a2ce"
-
-karma-sauce-launcher@^1.0.0:
+karma-sauce-launcher@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-1.1.0.tgz#3d083cf5659d6736ab97bcee5d8acd86ad522212"
   dependencies:
@@ -4528,7 +4299,7 @@ lodash@4.16.2:
   version "4.16.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.2.tgz#3e626db827048a699281a8a125226326cfc0e652"
 
-lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.5.1, lodash@^4.8.0:
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.5.1, lodash@^4.8.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -4553,12 +4324,6 @@ longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
-  dependencies:
-    js-tokens "^3.0.0"
-
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
@@ -4622,10 +4387,6 @@ map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
 
-marked@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
-
 "match-stream@>= 0.0.2 < 1":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz#99eb050093b34dffade421b9ac0b410a9cfa17cf"
@@ -4648,14 +4409,6 @@ math-expression-evaluator@^1.2.14:
   dependencies:
     lodash.indexof "^4.0.5"
 
-md5@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -5049,10 +4802,6 @@ null-check@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
 
-null-loader@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/null-loader/-/null-loader-0.1.1.tgz#17be9abfcd3ff0e1512f6fc4afcb1f5039378fae"
-
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
@@ -5222,7 +4971,7 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -5297,7 +5046,7 @@ parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
-parse5@^2.2.1, parse5@^2.2.2:
+parse5@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-2.2.3.tgz#0c4fc41c1000c5e6b93d48b03f8083837834e9f6"
 
@@ -5728,7 +5477,7 @@ pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
-private@^0.1.6, private@~0.1.5:
+private@~0.1.5:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.6.tgz#55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"
 
@@ -5740,10 +5489,6 @@ process@^0.11.0:
   version "0.11.9"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
 
-progress@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-
 prompt-sync@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/prompt-sync/-/prompt-sync-4.1.4.tgz#0bd3bcd3c899c0e860add6a2d6e6f4bdf0775658"
@@ -6353,14 +6098,14 @@ semver-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
 
-"semver@2 || 3 || 4 || 5", semver@^4.1.0, semver@^4.2.0, semver@~4.3.3:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-
-semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@~5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
+semver@^4.1.0, semver@^4.2.0, semver@~4.3.3:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+
 semver@~5.0.1:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
@@ -6477,10 +6222,6 @@ signal-exit@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-
 slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
@@ -6600,22 +6341,22 @@ source-map-url@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
 
-source-map@0.1.x, source-map@^0.1.38, source-map@^0.1.41, source-map@~0.1.33:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  dependencies:
-    amdefine ">=0.0.4"
-
 source-map@0.4.x, source-map@^0.4.2, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.X, source-map@>=0.5.6, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
+source-map@0.X, source-map@>=0.5.6, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
+source-map@^0.1.38, source-map@^0.1.41, source-map@~0.1.33:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  dependencies:
+    amdefine ">=0.0.4"
+
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
@@ -6954,10 +6695,6 @@ symbol-observable@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
 
-symlink-or-copy@^1.0.1:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.1.8.tgz#cabe61e0010c1c023c173b25ee5108b37f4b4aa3"
-
 synesthesia@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/synesthesia/-/synesthesia-1.0.1.tgz#5ef95ea548c0d5c6e6f9bb4b0d0731dff864a777"
@@ -7154,10 +6891,6 @@ to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
 
-to-fast-properties@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
-
 toposort@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.0.tgz#b66cf385a1a8a8e68e45b8259e7f55875e8b06ef"
@@ -7268,32 +7001,6 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typedoc-default-themes@^0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.4.2.tgz#640b854fd7ef19e6774496ea7741ec31a0dcaddc"
-
-typedoc@^0.5.0:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.5.5.tgz#7fde3f80eeeecad23100e0d7e4f321c5b79f11fa"
-  dependencies:
-    "@types/fs-extra" "0.0.33"
-    "@types/handlebars" "^4.0.31"
-    "@types/highlight.js" "^9.1.8"
-    "@types/lodash" "^4.14.37"
-    "@types/marked" "0.0.28"
-    "@types/minimatch" "^2.0.29"
-    "@types/shelljs" "^0.3.32"
-    fs-extra "^0.30.0"
-    handlebars "4.0.5"
-    highlight.js "^9.0.0"
-    lodash "^4.13.1"
-    marked "^0.3.5"
-    minimatch "^3.0.0"
-    progress "^1.1.8"
-    shelljs "^0.7.0"
-    typedoc-default-themes "^0.4.0"
-    typescript "2.1.5"
-
 typescript@1.8.10:
   version "1.8.10"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-1.8.10.tgz#b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"
@@ -7302,10 +7009,6 @@ typescript@2.0.10:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.0.10.tgz#ccdd4ed86fd5550a407101a0814012e1b3fac3dd"
 
-typescript@2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.1.5.tgz#6fe9479e00e01855247cea216e7561bafcdbcd4a"
-
 uglify-js@2.7.x, uglify-js@^2.6, uglify-js@^2.6.1, uglify-js@^2.7.5:
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
@@ -7687,22 +7390,6 @@ webpack-livereload-plugin@^0.9.0:
   dependencies:
     tiny-lr "^0.2.0"
 
-webpack-md5-hash@^0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/webpack-md5-hash/-/webpack-md5-hash-0.0.5.tgz#d9f1899ead664459dd8b6b0c926ac71cfbd7bc7a"
-  dependencies:
-    md5 "^2.0.0"
-
-webpack-merge@^2.0.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-2.4.0.tgz#4c518d471632c29ae22e83687c2f42a9cd5f35ea"
-  dependencies:
-    lodash "^4.17.4"
-
-webpack-node-externals@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.5.4.tgz#ea05ba17108a23e776c35c42e7bb0e86c225be00"
-
 webpack-sources@^0.1.0:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.4.tgz#ccc2c817e08e5fa393239412690bb481821393cd"
@@ -7758,7 +7445,7 @@ which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
-which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.4:
+which@^1.1.1, which@^1.2.1, which@^1.2.12:
   version "1.2.12"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
   dependencies: